Support providing a keystore from the classpath. Resolves #1853
Support providing a truststore from the classpath
Minor refactoring
Merge pull request #1854 from excilys/keystore-classpath

Support providing a keystore from the classpath. Resolves #1853