Merge remote-tracking branch 'origin/template-instance-cap-fix' into blargh
Mostly completed AMI building build steps.