Merge "Revert "Apex: Enable OS master clients with Tempest""