Merge "Revert "Convert mediawiki.toc and mediawiki.user to using mw.cookie""