Merging 5.5 years - who said Subversion is antiquate?

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