neutron-metering-agent service name is wrong

In Ubuntu the neutron-metering-agent package and Upstart service are named
neutron-plugin-metering-agent. In Debian they are named
neutron-metering-agent.

Partial-Bug: #1284179
(cherry picked from commit 57e16648629b8c541e094b848cecac53137949c4)

Change-Id: I76b56886a4d239b279731dc1e85c17a7f380aa76
VPNaaS service name is wrong

In Ubuntu the VPNaaS service name and package are
neutron-plugin-vpn-agent. In Debian the VPNaaS service name and package
are neutron-vpn-agent.

Closes-Bug: #1285314
(cherry picked from commit 1e3ff014972fb0f18f8509d404df583ec8a11762)

Change-Id: Id3a0e2e939d2608802b3b2b39634e6c8bb3c32f5
Merge "neutron-metering-agent service name is wrong" into stable/havana