Regression in Beaker 2.18.0 causes our AIO testing to fail

Currently the latest release of Beaker (2.18.0) has introduced a regression in the defaults for what the puppetservice should be. Its this patch basically that has caused it: https://github.com/puppetlabs/beaker/commit/d715cb1d31b2d92ac245fc55383b4dc1a3e727c0

In our code we have relied in the past on this option being 'puppetserver' but now within a minor release its changed to 'pe-puppetserver'.

For now I've added the lines:

export BEAKER_VERSION="git://github.com/puppetlabs/beaker.git#2.17.0"

To our acceptance tests:

https://jenkins.puppetlabs.com/job/platform_puppetdb_int-sys-legacystable/
https://jenkins.puppetlabs.com/view/PuppetDB/view/master/job/platform_puppetdb_intn-sys/
https://jenkins.puppetlabs.com/view/PuppetDB/view/stable/job/platform_puppetdb_intn-sys_stable/
https://jenkins.puppetlabs.com/view/PuppetDB/view/Other%20Builds/job/platform_puppetdb_intn-sys_pr/

To get this working again for us for now, but this will have to be removed once we have a proper solution.