Support branch@sha format for commit string
Revert migration to Haystack 2.0.0

This is a post-2.2 feature and is not available in an Avocado release.
Merge branch 'master' into demo