More work on our custom edit summary parsing

Change-Id: I85146f7eaa1871dc4356ad9494582621293f54d9
Separating html and html-light formatting for notifications

Change-Id: I388b8bbcce741005b34b87d7331e22d442ef1c9b
Merge changes I388b8bbc,I85146f7e

* changes:
  Separating html and html-light formatting for notifications
  More work on our custom edit summary parsing