Merge "Fix edit link for messages in $wgForceUIMsgAsContentMsg"

diff --cc includes/page/Article.php
Simple merge

diff --cc includes/specials/SpecialBlock.php
Simple merge

diff --cc includes/specials/SpecialRevisiondelete.php
Simple merge

diff --cc includes/specials/SpecialUpload.php
Simple merge