[COCOON-2341] Applying provided patches

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