…ructor

(to reduce number of args to all the OffsetStrategy impls)

Was a non-issue when OE == term but more of an issue in other cases.
Now matches order within the Passage is more sane in such cases.

…e merged.

When matches overlap, the formatted passage could contain weird end/open pairs.
Formatting as if the matches were merged is more sane I think.

… Weight Matches.

…when different.

Weight Matches highlighting needs this for some cases; especially
 when requireFieldMatch/fieldMatcher is in use.
Refactored FieldOffsetStrategy.getOffsetsEnum to take a LeafReader not IndexReader.

… not necessary anymore.

Updated based on MI improvements in master.
With subMatches, we have better fidelity on span queries.
And since MI can handle span queries now, no need to touch PhraseHelper.
* added to UHComponents: query, and highlightFlags
* updated tests to handle with/without WEIGHT_MATCHES
* TestUnifiedHighlighterStrictPhrases uses more randomization.
  Removed brittle score calculation dependence.
* Test Passage matches data is in order
TODO: OE freq & term()

…tead of its parts.

Resolved nocommits.