Merge proposals dependent on lp:~ajalkane/ubuntu-filemanager-app/remove-bookmark-functionality

1. remove-bookmark-functionality
2. Dependent merge proposals