Merge "(bug 41171) Refactor User::edits() and User::incEditCount()"