Squashed 'apache-el/src/main/' changes from 679d793..2c946d4

2c946d4 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56189 Remove unused file.

git-subtree-dir: apache-el/src/main
git-subtree-split: 2c946d482a61bee13718a4fbbc5d4ddfe5cb1e6a
Merge commit 'dd6f6b53114dc18ba0e48a398675d816020c10c6'

Conflicts:
	apache-el/src/main/webapps/docs/changelog.xml
Squashed 'apache-jsp/src/main/' changes from 679d793..2c946d4

2c946d4 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56189 Remove unused file.

git-subtree-dir: apache-jsp/src/main
git-subtree-split: 2c946d482a61bee13718a4fbbc5d4ddfe5cb1e6a
Merge commit '004f07f674f8717729fedaf46a360022c24be1a8'

Conflicts:
	apache-jsp/src/main/webapps/docs/changelog.xml