Tools: Unify Tools and Toolsbeta configuration

To properly test Tools puppetization in Toolsbeta, with the advent of
multi-instance self hosted puppetmasters in Labs, it is easier to use
a dedicated puppetmaster for Toolsbeta and assign "standard" Tools
roles to the instances.

Both has already been done; the only change with regard to Tools
itself is setting the maildomain conditionally.  This needs to be
verified after merging this change and a subsequent Puppet run on
tools-mail.

Change-Id: I45a27e02ed6616c20189964b2eade5b693b63ead
Merge "Tools: Unify Tools and Toolsbeta configuration" into production