Merged revision 1691487 from tomcat/trunk: Corrected the Tomcat 7 version where this interface was introduced for the first time