fix #6687 hibernate.event.merge.entity_copy_observer=log to avoid merge problems
ref #2939 adapting vaddin appcontext to new ehcache configuration
initial commit for project cdm-vaadin