Merge "Check for $wgAllowUserCss and $wgAllowUserJs in EditPage.php"