[COCOON-2305] #resolve

git-svn-id: https://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X@1450770 13f79535-47bb-0310-9956-ffa450edef68
[COCOON-2295] #resolve

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