Oh, and actually one comment to the new format of the resource key, too. I see that you tried to mimic the old one but I don't think it is unique enough to correctly handle enablement of different `If*` directives. Before, we were able to distinguish different directory directives under different `IfModule` even if they had the same name, etc. I don't think that's possible using the new resource key format because you don't take into account the parents of the directory directive.

Also, by changing the resource key format, you broke the `ApacheDirectoryCompoent#getNode()` method.

So I'd personally be for keeping the resource key format exactly the same which will make sure all the rest of the component code will be able to remain unchanged.