Update for latest Jenkins release.
Merge branch 'template-instance-cap-fix' into ami-builder