Jasig/cas — pull request #682 by mmoayyed (2014-08-28 10:33:56+00:00)
Title: 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.