PDB-554 add backoff and retry to state wait code

Signed-off-by: Ken Barber <ken@bob.sh>