Port patch for Tomcat BZ 55552: Fix expected type handling due to changes in EL3.