Changed wait_for_rdb_table_readiness poll_ms back to 10.
Removed old macro waitf.