More refactoring of OptionShouldContainSpec: pulled out a OptionShouldContainOneOfSpec.
Renamed MatchersUtil to MatchersHelper.