Merge "Update FProxy to separate truststore and keystore"