CLOUDIFY-1335 refactor abstract services and apps tests to be more robust
Merge branch 'master' of https://github.com/CloudifySource/Cloudify-iTests