Merge "Add min_client_version decorator for CLI tests"