Merge pull request #46 from cloudify-cosmo/feature/CFY-923-fix-distro-ident-bug

CFY-923 identify by ambiguous distro name
CFY-919 update configuration files to have templated package urls
CFY-923 further fixes to distro ident
Merge branch 'feature/CFY-919-bootstrap-existing-vm' into feature/CFY-923-fix-distro-ident-bug
CFY-923 workaround for release for weird Ubuntu distro identification