Merge "Move DatabaseDomain to Rdbms namespace"