Merge proposals dependent on lp:~vthompson/music-app/change-music-content-copy-location-1215932

1. change-music-content-copy-location-1215932
2. Dependent merge proposals