CSPACE-6321: Remove extraneous space from org History field.
Merge branch 'ucb-deploy_4.0' into botgarden_4.0
NOJIRA: Merge changes from defaults into tenant files.
BAMPFA-84: Add base set of integration tests.
Merge branch 'ucb-deploy_4.0' into botgarden_4.0
BAMPFA-84: Add botgarden integration tests.
BAMPFA-84: Add guava as a dependency, since it's required by selenium.
Merge branch 'ucb-deploy_4.0' into botgarden_4.0
BAMPFA-84: Add test configuration for botgarden.