Revert "Switch NetapiClient to use client_config instead of master_config"

This partially reverts commit 2bc1ed8afb7d7ad01e0fdb9422a44b1fb896845f.