Some modification to Util

- build against NF 20.4.46-beta
- improved the Registry helper functionality
  - map a class to only the registry and not the ResourceKey for the
    registry since it can just be gotten from the Registry

Signed-off-by: srs-bsns <[email protected]>