Fixes tests broken by the original implementation of TAP5-2331
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5