Fix NSX plugin for upstream neutron modules

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

Change-Id: Iea6b4a3a875a81221a65e7415b5d7a2dd38d913c
Merge "Fix NSX plugin for upstream neutron modules"