Make compatible with new override syntax

[priv-kweihmann]

still a few bits are using exclusively the old override syntax - adjust accordingly

[priv-kweihmann]

We might need to branch off support for older branches - new syntax is only supported down to dunfell