rdbms: make safeWaitForMasterPos() respect "waitTimeout"