Rename some builders.
Parse rather than match distribution name.
Merge branches 'omnibus-build' and 'acceptance-tests' into staging