Merge "Avoid using DB_MASTER in SpecialEditWatchlist::getWatchlist()"