--- a/src/hotspot/share/classfile/systemDictionary.cpp	Fri Aug 10 14:22:49 2018 +0300
+++ b/src/hotspot/share/classfile/systemDictionary.cpp	Fri Aug 10 09:30:26 2018 -0400
@@ -1853,6 +1853,9 @@
 
     // First, mark for unload all ClassLoaderData referencing a dead class loader.
     unloading_occurred = ClassLoaderDataGraph::do_unloading(do_cleaning);
+    if (unloading_occurred) {
+      ClassLoaderDataGraph::clean_module_and_package_info();
+    }
   }
 
   if (unloading_occurred) {