Merging cdmlib-services to trunk; pesi. Merge rev 8267:8428