Fix BZ54890. Update daemon to latest release

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1475736 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54801
and
https://issues.apache.org/bugzilla/show_bug.cgi?id=54821
Don'try to parse EL expressions if EL is disabled or inside scriptlets.
Based on patches by kkolinko

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1475750 13f79535-47bb-0310-9956-ffa450edef68