Merge pull request #54 from daniellemayne/develop

general tidy up loosely related to bugzid 3380 - develop
Merge pull request #56 from daniellemayne/develop

bugzid 3695: fixed snapshot issues due to hp changing api - develop
Merge pull request #58 from daniellemayne/develop

bugzid 3802: fixed get security groups for server