OPENJPA-2305: Canonical MetaModel class generation should not use inhertence - applied Pinaki's trunk changes to 2.1.x.