Merge "Remove MediaWiki mentions from /rdbms error strings"