Merge "Move DBMasterPos to Rdbms namespace"