Merge pull request #27 from itaifrenkel/2_3_1

backport of CLOUDIFY-1405 from 2.5.0