Escape options passed to beaker

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch 'ticket/1.3.x/escape-cli-options-for-beaker' into 1.3.x

* ticket/1.3.x/escape-cli-options-for-beaker:
  Escape options passed to beaker