pulled out common code to functions for resources
Merge branch 'pcm/bug-1258656' of https://github.com/CiscoSystems/neutron into pcm/bug-1258656

Conflicts:
	neutron/extensions/vpnaas.py