Fix #926

Make HostPort a real option without being set to ContainerPort if absent.
Ahh, how come I forget this one? :-P Done!