Merge branch 'master' into pkg_mgmt
[osm/UI.git] / manifest / LICENSE