Backporting NB28 support for organize and add with module imports

Author: sid-srini

build.xml

@@ -55,6 +55,7 @@
             patches/8460-draft.diff
             patches/8745-draft.diff
             patches/8770.diff
+            patches/8827.diff
             patches/disable-error-notification.diff
             patches/mvn-sh.diff
             patches/project-marker-jdk.diff