Merge "Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type...
authorvelandy <rajesh.velandy@riftio.com>
Fri, 28 Apr 2017 21:22:40 +0000 (23:22 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 28 Apr 2017 21:22:40 +0000 (23:22 +0200)

Trivial merge