Decouple userid build from build:freereg

Runs as complete rebuild of users and userids if recreate
Change to raid-freereg2 on vervet