Check for album's with artist in title

Fixes #1788 and #1666
Merge branch 'Fix-for-artist-name-in-album-title' into develop