Correct the logic that selects the encoding to use to decode the query string in the SSIServletExternalResolver so that the useBodyEncodingForURI attribute of the Connector is correctly taken into account.
tomcat/tc8.0.x/trunk/
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java