Merge pull request #215 from bphinz/master

Improved x509 auth for java viewer