Merge proposals dependent on lp:~cisco-openstack/puppet-openstack-cisco/havana-puppet-catalog-diff

1. havana-puppet-catalog-diff
2. Dependent merge proposals