Merged revision(s) 1536850, 1536852 from tomcat/trunk: Follow-Up to r1536834: Use correct order of initialization methods.