setup_for_non_root.sh: Tweak commands so this script can be re-run without warnings.
setup_for_non_root.sh: Tweak commands so this script can be re-run without warnings.

OpenDataServices/opendataservices-deploy,OpenDataServices/opendataservices-deploy