Merge "multiple sonar fixes - RestMusicAdminAPI.java"