Remove proxying of resources_fs, and add a unittest that exposes the problem

[PLAT-191]
Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards

[PLAT-191]
Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system

Fix PLAT-191