Merge pull request #21 from daniellemayne/develop

Develop - bugzids 3383, 3390
Merge pull request #23 from daniellemayne/develop

remove duplicate cloud calls when launching servers (develop)