Fix test failure under Java 8.  Root cause is in CombinationTestSupport
and only shows up in Java 8 because iteration order of the options map
changes such that the expandCombination method gets an empty value for
an option and returns immediately without evalutating all the added
options.