Merge "Modify ONAP PAP REST classes basic checkstyle"