extend port_forwarding type to identify primary/secondary ip addresses
Merge branch 'feature-portforwarding-with-a-twist' into srf-master