Closes #6994 Overwrite duplicate thumbnails
Merge branch 'master' of git://yorba.org/shotwell