Merge "Uplift of PMS code from ONAP"