[COCOON-2347] Merge to trunk from BRANCH_2_2_COCOON-2347 - thanks Gabriel Gruber @ggruber4711

git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@1828354 13f79535-47bb-0310-9956-ffa450edef68