Bk 1288 Thumbnails for certain cover types or error thumbnail are broken

Updating 2.0 to upstream 2.0, 
Delivers BK-1288