Hardset time limit on deploy_init_to - 30min
Fix ATMO-313
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja