Support for including some modules that specify a loader plugin in
server-expanded bootstrap layer.
Unit test updates