Refactoring: shortened class names.
Merge branch 'master' of github.com:jenkinsci/acceptance-test-harness