Added ability to bypass client key validation when no keystore is present