https://cloudifysource.atlassian.net/browse/CLOUDIFY-1846