Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev