Revert Sync with upstream puppet-neutron

* This reverts commit 20149679643e9beb9177a386c14bd2181e8a53ff,
reversing changes made to a1e19c10ba6aedf6b8d6dd0f67c866a2f4310dc5.
First, have to fix BVT green

* This reverts commit a1e19c10ba6aedf6b8d6dd0f67c866a2f4310dc5,
reversing changes made to 7a6ca611b53988902285d9f5d52bc6dd1b933713.
First, have to fix BVT green

Change-Id: I12c20bfbe757512e5ecfaeba364089e11a3dbcf7