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

1. havana-puppet-neutron
2. Dependent merge proposals