Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-1469122-show-user-bookmarks-when-administrator

1. fix-1469122-show-user-bookmarks-when-administrator
2. Dependent merge proposals