Fixed EC2OndemandSlave constructor issues in SlaveTemplate