CLOUDIFY-1851 pull request touch ups