Merge "Make sure that gateway is in CIDR range by default"

diff --cc etc/neutron.conf
Simple merge

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

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge

diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
Simple merge

diff --cc neutron/tests/unit/nuage/test_nuage_plugin.py
Simple merge

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

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