[COCOON-2347] Applying provided patches + small reworks (removing deprecates and adding Override)

git-svn-id: https://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_2_COCOON-2347@1711430 13f79535-47bb-0310-9956-ffa450edef68
12 files changed