8164887: update tests to remove use of old-style optionsReviewed-by: mchung
8156680: jdeps implementation refreshReviewed-by: dfuchs