Merge "Fix critical sonar for ONAP-PAP-REST"