Merge branch 'pkg_mgmt' 85/885/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Fri, 6 Jan 2017 19:14:41 +0000 (19:14 +0000)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Fri, 6 Jan 2017 19:15:23 +0000 (19:15 +0000)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge