use 7 char sha1 hashes internally to allow more room on the command line
Merge branch 'feature/deployment-branches' into deploy/0.4.2-pre-2

* feature/deployment-branches:
  use 7 char sha1 hashes internally to allow more room on the command line