Merged r1593335 from tomcat/trunk: Review of r1593288: Do not forget to call the symmetrical unset method on stop.