jdk/jshell/CompletionSuggestionTest.java is failing, and looks like it have trouble to complete for java.util, and this seems to be directly related to the merge of 8131027: JShell API/tool: suggest imports for a class.

The JPRT failed report is at
http://scaaa637.us.oracle.com/archive/2016/03/2016-03-03-075711.hjen.jake-work/logs/linux_i586_3.8-product-c1-langtools_jtreg.log.FAILED.log

As far as I can tell, the merge seems clean, since the only conflict change is following where the method is removed completely. However, am not sure if related logic is still relevant.

@@ -636,11 +636,11 @@
        }
    }

    private void listPackages(Path path, String enclosing, Set<String> packages) {
        try {
- if (path.equals(Paths.get("JRT_MARKER_FILE"))) {
+ if (path.equals(Paths.get(System.getProperty("java.home"), "lib", "modules"))) {
                FileSystem jrtfs = FileSystems.getFileSystem(URI.create("jrt:/"));
                Path modules = jrtfs.getPath("modules");
                try (DirectoryStream<Path> stream = Files.newDirectoryStream(modules)) {
                    for (Path c : stream) {
                        listDirectory(c, enclosing, packages);