Get browser tests passing for new highlighter

The new highlighter doesn't support phrase highlighting so some of the
highlights got worse.  A few better.  Some new ones were added to show
off what intentionally improved.  Bug 64259 should help with that.

Also fixed a broken page creation hook and cleaned up the tags a bit.

Change-Id: I3507b7b1534cfb043ebd4b68a4670ae45f05515a
Merge "Get browser tests passing for new highlighter"