Clean-up ObjectWriter
Merge remote-tracking branch 'origin/master' into evolProfiling2

Conflicts:
	src/org/zoodb/jdo/internal/server/ObjectWriter.java