Merge "rdbms: Avoid declaration incompatibility IDEA warnings in safeWaitForMasterPos()"