CFY-516 manual merge with develop due to merge complexity
Merge branch 'feature/CFY-516-packman-opensource-phase2' of github.com:cloudify-cosmo/cloudify-packager-ubuntu into feature/CFY-516-packman-opensource-phase2