Merge branch 'template-node-name'
Merge branch 'template-instance-cap-fix'

Conflicts:
	src/main/java/hudson/plugins/ec2/EC2Slave.java