Added bookmark support to hgfs.

Added new option to hgfs ``hgfs_branch_method``. If set to ``branches``,
bookmarks will be ignored. If set to ``bookmarks`` branches will be
ignored. If set to ``mixed`` both will be used.
Merge pull request #6907 from shadowfax-chc/hgfs-bookmarks

Added bookmark support to hgfs.