Cherry pick fix for tuskar-ui to tuskar-api race condition
Merge pull request #86 from rwsu/tuskar-race

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