JDO small edits for 2.2 release