Merge pull request #2506 from johnmccutchan/device_port_forward

Add DevicePortForwarder