More cleanups
Merge branch 'CFY-1829-nodecellar-cloudstack-blueprint' of https://github.com/cloudify-cosmo/cloudify-nodecellar-example into CFY-1829-nodecellar-cloudstack-blueprint