Merge "Separate content parts of mw-usertoollinks from presentation"