--- old/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java	2016-04-25 15:19:37.000000000 -0700
+++ new/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java	2016-04-25 15:19:37.000000000 -0700
@@ -295,8 +295,7 @@
                     .filter(e -> e.startsWith(SERVICES_PREFIX))
                     .distinct()
                     .map(this::toServiceName)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
+                    .flatMap(Optional::stream)
                     .collect(Collectors.toSet());
 
             // parse each service configuration file