Merge branch 'pm_phase2' into v2.0 09/1709/1
authorsinhan <nandan.sinha@riftio.com>
Wed, 26 Apr 2017 18:42:43 +0000 (18:42 +0000)
committersinhan <nandan.sinha@riftio.com>
Wed, 26 Apr 2017 23:09:20 +0000 (23:09 +0000)
Signed-off-by: sinhan <nandan.sinha@riftio.com>

Trivial merge