fixed keystore configuration and tomcat users; indentation