Merge "Use the admin client for the QoS tag tests"