stupid regression in previous fix: make sure bookmark names don't end with whitespace.

Created originally on Bitbucket by vosc (Volker Schumacher)

Was already merged in Bitbucket before import, marked as merged by the import user