Downstream patches

Merge some Zendesk patches.

* Add cancelling to Job#active?
* Handle nil lock descriptions
  * Might not be useful for new users, but just in case
* Add bundler to the gemfile
  * Caused problems with Samson hot-restarts

@zendesk/samson