Now that we have to actually inject both of these into ChangeNotes, it was getting a little unwieldy. There was practically nothing in ChangeNoteUtil itself anyway. Merge CommentsInNotesUtil into ChangeNoteUtil so we only have one thing to inject. Change-Id: I41ef88dd2911b9d007f8b3a4cf7d3d7159fa25e6