First Customer Release
Merge remote-tracking branch 'upstream/master'
Fixing stackrc
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/openstack-dev/devstack
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/CiscoSystems/devstack into pcm/bp/vpnaas-cisco
changed for cisco driver as default
Merge branch 'pcm/bp/vpnaas-cisco' of https://github.com/CiscoSystems/devstack into pcm/bp/vpnaas-cisco

Conflicts:
	lib/neutron_plugins/services/vpn