Merge "(bug 18834) Add an edit count to rollback link"