Fix SlateTemplate conflicts

Correct some conflicts for SlaveTemplate.java
Merge branch 'upstream_changes' of https://github.com/bwall/ec2-plugin into upstream_changes