Merged revisions r1429173 r1429182 from tomcat/trunk:
Fix leak of servlet instances when running with SecurityManager:
a) In case when initServlet() or destroy() fail.
b) In case of a SingleThreadModel servlet. (fix wrong argument)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1429186 13f79535-47bb-0310-9956-ffa450edef68