Merge "Apex: Cleanup slave/slave-label configuration"