add openstack.neutron.vpnaas states
Finished adding openstack.neutron.fwaas states.
Merge branch 'dev-fwaas' into develop