Merge "TrustManagerImplTest: instantiate TrustManagerImpl directly instead of using factory"