Merge "openstack_adapter container fails to start"