Merge "Merge branch 'pkg_mgmt' into v1.1" into v1.1
authorkashalkar <kiran.kashalkar@riftio.com>
Wed, 25 Jan 2017 15:11:02 +0000 (16:11 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Wed, 25 Jan 2017 15:11:02 +0000 (16:11 +0100)

Trivial merge