Sync with upstream puppet-neutron

    from master a4fb2d25b1e1d7bcf2ca91d353ac6388f27ff82f

blueprint: ml2-neutron
related-blueprint merge-openstack-puppet-modules

Fuel-CI: disable
Change-Id: I5db2be15884cc3bd9c9d88621288eaddbaf1acd0
Merge "Sync with upstream puppet-neutron"