Merge "Fix compute baremetal service client tests"