setting gw to first+1 if gw_ip is not given in subnet_create, fixed dns_nameserver display issue in subnet_vnc_to_neutron()
Merge pull request #19 from Juniper/hajay_disallow_ip_collision

backport disallowing of ip addr dup between ports
Enable configurtion of contrail extensions
Set the default value of contrail_extensions as per the review comment
Add Quota Support

Implement QuotaDriver based on neutron.ConfDriver

Signed-off-by: Nicolas PLANEL <nicolas.planel@enovance.com>
Merge pull request #23 from Juniper/hajay_cherrypick

cherrypick quota + extension config from mainline
Bug 1326969: fix issues in get_ports and get_floatingips
Merge pull request #34 from Juniper/sb

Bug 1326969: fix issues in get_ports and get_floatingips
Update to the earlier fix for 1326969
Merge pull request #18 from Juniper/amoghe-neutron

Amoghe neutron
Merge pull request #35 from Juniper/sb

Sb
Merge remote-tracking branch 'upstream/R1.06' into R1.06

Conflicts:
	neutron_plugin_contrail/plugins/opencontrail/ctdb/config_db.py
	neutron_plugin_contrail/plugins/opencontrail/quota/driver.py