CP-7800

Properly fix the tap-ctl race condition issues.