back port latest changes from V00-22

make sure that V00-21 is identical to V00-22 except the preinstall check for root user