merge cdmlib-persistence from validation branch to trunk