Merge "Cast namespaceId to int in SpecialEditWatchlist::cleanupWatchlist"