master
Fix __resource__ injection in resource_modules loader and add tests
test(resources): share top.sls + clear master state on minion teardown
Fix mmap-backed resource registry concurrency and bare-ID targeting tests
test(resources): pin pillar+discovery contract with unit and integration coverage
fix(resources): make merge-fun state.* work for bare-id targets
feat(resources): per-type directory layout for resource overrides