data-model.xml persistence-architecture.xml tutorial.xml updated for 1.6 master