Merge "Make Maintenance::commitTransaction() do slave wait checks"