Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev