Conflicts:
	src/java/org/jivesoftware/openfire/XMPPServer.java
	src/java/org/jivesoftware/openfire/net/SASLAuthentication.java
	src/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java
	src/java/org/jivesoftware/openfire/session/LocalClientSession.java
	src/java/org/jivesoftware/util/CertificateManager.java
	src/web/WEB-INF/admin.tld