Merge "Fixes BgpVpn service name and tht fixes"

diff --combined build/opnfv-environment.yaml
index 535fb94,6dce7bd..a273265
--- 1/build/opnfv-environment.yaml
--- 2/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@@ -12,8 -12,7 +12,8 @@@ parameter_defaults
    NeutronEnableDHCPMetadata: true
    NeutronEnableIsolatedMetadata: true
    # NeutronDhcpAgentsPerNetwork: 3
 -  NeutronPluginExtensions: 'qos,port_security,data_plane_status'
 +  NeutronPluginExtensions: 'qos,port_security,neutron.plugins.ml2.extensions.\
 +                            data_plane_status:DataPlaneStatusExtensionDriver'
    # TODO: VLAN Ranges should be configurable from network settings
    NeutronNetworkVLANRanges: 'datacentre:500:525'
    # NeutronVPPAgentPhysnets:
@@@ -133,7 -132,7 +133,7 @@@
      - OS::TripleO::Services::NeutronVppAgent
      - OS::TripleO::Services::OVNDBs
      - OS::TripleO::Services::Vpp
-     - OS::TripleO::Services::NeutronBgpvpnApi
+     - OS::TripleO::Services::NeutronBgpVpnApi
    ComputeServices:
      - OS::TripleO::Services::Barometer
      - OS::TripleO::Services::CACerts