bug fixes
Merge branch 'develop' of github.com:cloudify-cosmo/cloudify-packager into develop