Added container.cfg.xml to config directories missing it
Merge pull request #898 from rackerlabs/test-fixes

Added container.cfg.xml to config directories missing it
Hopefully this prevents the address in use? Added todos
Merge pull request #901 from rackerlabs/test-fixes

Fix the pipeline!
Addressed todos, could do more refactoring
Using null safe operator
Merge pull request #902 from rackerlabs/test-fixes

Addressed todos, could do more refactoring