CLOUDIFY-1726 - Ported issue to 2.7