Merge "Make Maintenance::commitTransaction() avoid using deprecated method"