Fix issues that were preventing pre and post scripts execution
Merge branch 'branch_v1.0' of ssh://cdcvs.fnal.gov/cvs/projects/gwms-cloud-vms into branch_v1.0

Conflicts:
	pilotservices/pre-scripts/mount_ephemeral