Merge "Adding support for containerized undercloud"