Merge "JUnit workaround for PAP-REST, sonar bug"