Fix imports after move of nrv.utils to commons repo

Scalariform also kicked in...