CLOUDIFY-2034 CLOUDIFY-2015 port to 2_6_2