Merge branch 'pkg_mgmt'

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>