Merge "Use canonical class name. Include ORMRowTest.php"