Fix the neutron reconfigure issue when enable linuxbridge-agent
Fix the neutron reconfigure issue when enable linuxbridge-agent

Change-Id: I69a19a028fd0ac7f88f84ba1ff246e91d2a8c223
Closes-Bug: #1568424
(cherry picked from commit f5c88efa872aa9964c9ff55397e1ace7b0a028bb)

negronjl/kolla,negronjl/kolla,negronjl/kolla