Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev