3376 with inconsistencies on bookmark back buttons
Better link for logged out people snooping
3376 Rebase and fix indents
3376 Fix test for Bookmark link text
3376 Move bookmark test to its new location
Merge pull request #958 from sarken/issue_3376

3376 with inconsistencies on bookmark back buttons
3909 Merge with master