Merge "Fix unit test failure in ONAP-PDP-REST"