Address config incompatibility introduced with oslo.config >= 1.2.0

This patch changes how nvp cluster specific configuration is retrieved
from nvp.ini so that it no longer relies on _cparser, which has been
removed in newer versions of oslo.config.

Fixes bug #1200609

Change-Id: I631c6584ca6b45d0f716533bd1d711d049c6f157
Bump stable/grizzly next version to 2013.1.4

Change-Id: I817767bcb618edf94363aa34dd0eb6ce897ce141
Merge "Address config incompatibility introduced with oslo.config >= 1.2.0" into stable/grizzly
Cisco plugin (grizzly) device connection errors

This commit fixes the Cisco plugin device connections issue where the plugin would drop
connections to the Nexus switches.

Change-Id: I9f09d22cb359b4fcdae5f5063a97011d82daf5a1
Fixes: Bug 1212834
Adds default route to DHCP namespace for upstream name resolution.

Any time the DHCP server is updated this code will maintain a default
route in the DHCP namespace using the gateway_ip attribute of the
first DHCP-enabled IPV4 subnet in the list of subnets where gateway_ip
is not None.  This strategy uses the same gateway ip that the DHCP
server hands to the VMs on the network.

Fixes: Bug #1181378

Conflicts:

	quantum/agent/dhcp_agent.py

Change-Id: I0807550a848e1b610c7775d215643ad9c83629ed
(cherry picked from commit 5dd0cf15463e181b92c8809c2dcc7603bb156a0e)
Merge "Cisco plugin (grizzly) device connection errors" into stable/grizzly
Merge branch 'grizzly' of https://github.com/CiscoSystems/quantum into grizzly