FileTrustStoreSslSocketFactory must support JVM truststore

I discovered a bug with the `FileTrustStoreSslSocketFactory` that I noticed it was improperly loading the custom and default truststores, and failing to combine them. This pull addresses that, and is accompanied by unit tests. 
I always like to find a description and a "at since" annotation, even for a test class.