Merge "Make invalidateModuleCache() take a database domain ID"