Merge "Add a system_modules defn for core.current.stubs"