Merge "Correct configuration setting using NUMBER_FAKE_NOVA_COMPUTE"