CLOUDIFY-1335 fixed compilation errors due to refactroing
Merge branch 'master' of https://github.com/CloudifySource/Cloudify-iTests