TEMPORARY neutron-keystone fix

Fix incompatibles between new Neutron and old Keystone manifests

This commit may be (or should be) reverted after merge new upstream
Keystone manifests.

Authors: Andrew Woodward, Sergey Vasilenko

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

Fuel-CI: disable
Change-Id: I9ed1dceeee2f4584df8c95d9fb57e705acc6d666