changed order of properties merging for hibernate session