Fix test failures when run as root

Conflicts:
	supervisor/options.py
	supervisor/tests/test_options.py