Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc param.

Signed-off-by: sinhan <nandan.sinha@riftio.com>