Merge "Fixup for manila-api containerized service"