Add tests for custom keystore, and fix Selendroid handling
Merge pull request #3211 from imurchie/isaac-cert

Add tests for custom keystore, and fix Selendroid handling