Merge "Move CLIENT_PROTOCOL_VERSION to point of use"