Merge branch 'pkg_mgmt' into v1.1 60/1060/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 1 Feb 2017 15:41:02 +0000 (10:41 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 1 Feb 2017 15:41:17 +0000 (10:41 -0500)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge