Merge "keystore_cli_v2: Add support for testing against v0.3."