Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54382
Avoid NPE with an empty SSI directive

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1430553 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54390
Back-port r1430567:
Use /usr/libexec/java_home to determine JAVA_HOME on Mac OS X if it is available.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1430568 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54390
Changelog update.

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