Patch available on: http://gerrit.beaker-project.org/4495
This fix was merged into the release-21 branch but we won't be producing any further 21.x bug fix releases. This will be included with 22.0 instead.
Beaker 22.0 has been released.