reverse commit d983f2089e612
encrypt root password during install
Merge remote-tracking branch 'upstream/master'

pick up changes around NicTool nt_group_id (0 is not a valid value for an auto_increment field)
also, nt_group_id of '0' can cause (if defined) tests to fail ('0' as a boolean rather than int)