Merge pull request #18639 from calavera/force_api_version

Force API versioning in the client library.