Merge branch 'template-instance-cap-fix' into ami-builder-base

Conflicts:
	src/main/java/hudson/plugins/ec2/EC2Slave.java
Mostly completed AMI building build steps.