Merge "Clean up old Maven to Buck switch criteria"