Merge "[CLAMP-26] upgrade org.onap.policy"