calico-dhcp-agent could not import neutron.agent.common.config

[YujiAzama]

I got neutron agent common config module import error.
I think because neutron.agent.common.config moved to neutron.conf.agent.common.

$ /usr/local/bin/calico-dhcp-agent --config-file /etc/neutron/neutron.conf & echo $! >/opt/stack/status/stack/calico-dhcp.pid; fg || echo "calico-dhcp failed to start. Exit code: $?" | tee "/opt/stack/status/stack/calico-dhcp.failure"
[1] 18867
/usr/local/bin/calico-dhcp-agent --config-file /etc/neutron/neutron.conf
Traceback (most recent call last):
  File "/usr/local/bin/calico-dhcp-agent", line 7, in <module>
    from networking_calico.agent.dhcp_agent import main
  File "/usr/local/lib/python2.7/dist-packages/networking_calico/agent/dhcp_agent.py", line 26, in <module>
    from neutron.agent.common import config
ImportError: cannot import name config
calico-dhcp failed to start. Exit code: 1

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/448890

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/448890
Committed: https://git.openstack.org/cgit/openstack/networking-calico/commit/?id=f627de35d167b844a0073d2d49ee28c6ddf6922f
Submitter: Jenkins
Branch: master

commit f627de35d167b844a0073d2d49ee28c6ddf6922f
Author: YujiAzama <email address hidden>
Date: Thu Mar 23 13:42:18 2017 +0900

    Fix Neutron common config import error

    Fix Neutron Agent common config path because it moved to
    neutron/conf/agent/common from neutron/agent/common/config.

    Change-Id: If5f88739d63d82251c95a7ff5e88ac85aa267a86
    Closes-Bug: 1675238