Merge pull request #22 from ua-eas/fix_deploy

removed embedded space in deployment descriptor, as it was causing capis...
Merge pull request #25 from ua-eas/KATTS-2473

KATTS-2473 changing source of code for TRN deployment
Merge branch 'master' into development
KATTS-2614 Adding addresses for TRN and SUP
KATTS-2035 Merging staging branch into master to include KATTS-2614