Merge "fixed sonar issues in RestMusicAdminAPI.java"