Fix neutron.tests.unit.test_dhcp_agent
Fix neutron.tests.unit.test_metadata_namespace_proxy
Apply existing patches (quilt push -a)
Merge branch 'calico_2014.1' into merge-tmp

Conflicts:
	setup.cfg
Prepare base for new Calico patch
Merge branch 'merge-tmp' into ubuntu_2014.1
Regenerate calico.patch (quilt refresh)
Unapply patches (quilt pop -a)
Version 1:2014.1-0ubuntu1calico0.5