Cherry pick fix for tuskar-ui to tuskar-api race condition