Remove workaround for VPNaaS configuration
Remove workaround for VPNaaS configuration

https://review.openstack.org/273934 was merged some time ago, so we
can remove the workaround and use the proper code.

Change-Id: I6508cee9ec98c88fd8d3a220c8a76304b0e7c732

openstack/packstack,stackforge/packstack,openstack/packstack,fr34k8/packstack,mahak/packstack,stackforge/packstack,mahak/packstack,fr34k8/packstack,mahak/packstack,stackforge/packstack,openstack/packstack,fr34k8/packstack