Merge "Neutron metering does not check overlap ip range"

diff --cc neutron/db/metering/metering_db.py
Simple merge

diff --cc neutron/extensions/metering.py
Simple merge

diff --cc neutron/tests/unit/db/metering/test_db_metering.py
Simple merge