Merge "Fix testHandleIdleMaintenance_deleteStaleSessions."