Merge "RestMusicQAPI.java - Sonar Fixes"