Revert "merged patch to new version of struts-config.xml"

This reverts commit d2440b8c74f51433ae30720401617c021cac3493.
Revert "original file from 6.1.1"

This reverts commit b4106f75fc17c4cd10c7514952962304a5b12c07.