Rename some builders.
Merge branches 'omnibus-build' and 'acceptance-tests' into staging