CLOUDIFY-2034 workaround for 2_6_1. the Real fix will be available on 2.7.0 soon