Fix two more hgfs bugs
Fix two more hgfs bugs

This fixes two additional hgfs bugs:

1. _get_ref() never looks at bookmarks, making it impossible to serve
   files using a bookmark as an environment.

2. Exceptions during a pull (in a fileserver update) will cause the
   update() function to abort, failing to clear the fileserver update
   lockfile. Thanks to a bitbucket outage for helping uncover this one!

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt