Fix DockerPortForwarder issues

Minor issues surfaced with vcloud-director changes