Merge "rdbms: make safeWaitForMasterPos() respect "waitTimeout""