adapt resource name to new capabilities of cloudstack

RELAUNCH-7601
Merge branch 'feature-portforwarding-with-a-twist' into srf-master

Conflicts:
	platform_services_cloudstack/manifests/port_forwarding.pp