Fix #926

Make HostPort a real option without being set to ContainerPort if absent.
Merge pull request #958 from dchen1107/port

Fix #926