CLOUDIFY-2546 update sanity
CLOUDIFY-2546 update sanity
Merge pull request #158 from CloudifySource/feature/CLOUDIFY-2546-update-sanity

Update sanity
Merge branch 'develop' into feature/CLOUDIFY-2392-ElasticSearch-Storage-Impl
fixed host ip bug
fixed sanity script
fixed sanity, fixed test indentation in test_deployments
Merge remote-tracking branch 'origin/feature/CLOUDIFY-2392-ElasticSearch-Storage-Impl' into feature/CLOUDIFY-2392-ElasticSearch-Storage-Impl