Merge branch 'master' of github.com:Red5/red5-server

Author: mondain

src/main/server/conf/jee-container.xml

@@ -88,7 +88,6 @@
                             <entry key="sslProtocol" value="TLS" />
                             <entry key="keystoreFile" value="${rtmps.keystorefile}" />
                             <entry key="keystorePass" value="${rtmps.keystorepass}" />
-                            <entry key="keystoreType" value="JKS" />
                             <entry key="truststoreFile" value="${rtmps.truststorefile}" />
                             <entry key="truststorePass" value="${rtmps.truststorepass}" />
                             <entry key="clientAuth" value="false" />