Merge "Change daemon Pidfile class to not use root_helper"

diff --cc neutron/agent/linux/daemon.py
index 3df12d580e8ecb9428360fc5772f61c9ae5457be,d1118674e03dc6588217b2ebd88bd1271e54c174..38c1bb5db9bc789efc17c898f1013d7e489863ea
--- 1/neutron/agent/linux/daemon.py
--- 2/neutron/agent/linux/daemon.py
+++ b/neutron/agent/linux/daemon.py
@@@ -19,10 -19,8 +19,9 @@@
  import atexit
  import fcntl
  import os
 +import signal
  import sys
  
- from neutron.agent.linux import utils
  from neutron.openstack.common import log as logging
  
  LOG = logging.getLogger(__name__)

diff --cc neutron/agent/linux/dhcp.py
Simple merge

diff --cc neutron/tests/unit/test_linux_daemon.py
Simple merge

diff --cc neutron/tests/unit/test_linux_dhcp.py
Simple merge