Allow --api-version to properly override various default behaviors in CLI

Part of #1519 - allows users to control what gets sent to the server