NX-493: De-mavenize

By mistake, some repo helper classes were extending
maven specific helpers instead of the core ones. Nothing
biggy, but this is not needed.