CLOUDIFY-2180 Fix test to start a seperate machine, not reuse management machine. refactoring
Merge branch 'master' of https://github.com/CloudifySource/Cloudify-iTests