Fixing NPE caused by commit for: Module architecture fails to populate
aware_of modules in ModuleClassLoader if they start in the wrong order -
TRUNK-4487(cherry picked from commit 1493392dde0f43b2590e7238fce8810898318843)