--- a/make/common/Modules.gmk	Wed May 10 14:55:31 2017 -0700
+++ b/make/common/Modules.gmk	Thu May 11 08:56:44 2017 +0200
@@ -391,7 +391,10 @@
       else ifeq ($$(classloader), ext)
         PLATFORM_MODULES += $1
       endif
-      DOCS_MODULES += $1
+      ifneq ($$(include_in_docs), false)
+        # defaults to true if unspecified
+        DOCS_MODULES += $1
+      endif
     else
       # Default to include in all
       JRE_MODULES += $1