Fix failures in testAllOpenSSLCiphersMapped() after changes to how unit test reports cipher names in r1615205
Start to fix testOpenSSLCipherAvailability() but more work required

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