Merge "Fix Sonar issues in org.onap.policy.controller pkg"