Merge "music-tomcat: Use "common.repository" framework"