[hibernate-dev] master->metamodel and matrix/test consolidation