LPS-28948

Upgrade from '6.1.0 CE to 6.1.1 CE'/'6.1.0 CE to 6.1.20 EE' - Fails
when there are bookmarks