Merge "Fix missing spaces in strings split across lines"

diff --cc neutron/api/v2/attributes.py
Simple merge

diff --cc neutron/common/config.py
Simple merge

diff --cc neutron/common/exceptions.py
Simple merge

diff --cc neutron/plugins/embrane/agent/operations/router_operations.py
Simple merge

diff --cc neutron/plugins/ibm/agent/sdnve_neutron_agent.py
Simple merge

diff --cc neutron/plugins/ibm/sdnve_api.py
Simple merge

diff --cc neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge

diff --cc neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
Simple merge

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge

diff --cc neutron/policy.py
Simple merge