No functional change.
Move some longer lines around prior to some functional changes.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1511212 13f79535-47bb-0310-9956-ffa450edef68
When using a security manager always use the same method inside the doPrivileged call as triggered the call. This fixes an startup failure when running 8.0.x under a security manager as it uses a listener that does not have a zero arg constructor.

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