Sort the combined header+topic revisions after merging

Change-Id: I3851469b3b8995a0aebfcb9f7444c9975789ba5a
Merge "Sort the combined header+topic revisions after merging"