XD-2239 Fix incorrect IP Address associated with containers

* Make the container IP address configurable
* Make the container hostname configurable
* Add tests