Merge "Make ApiStashEdit::pruneExcessStashedEntries use user name"