Merge "add Metering and VPNaaS aspects to dummy provider"