build-494: docker and cloudinit fixes