Additional fixes

Forgot to replace nipap-passwd syntax in some files.
Also fixed the non-working nipapd --version (thanks plajjan).