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
Merge pull request #1 from Liferay-Patchers-Community/master

jb(s) 1st 2013 pull