Merge "Fix comparison issues in onap pap rest"