Changes

Summary

1. Merge the branch 2.3 to trunk.

Revision 19712 by tao: Merge the branch 2.3 to trunk.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_process_daemon	d1_process_daemon
	/software/cicore/trunk/cn/d1_process_daemon/src/main/resources/org/dataone/configuration/config.xml	d1_process_daemon/src/main/resources/org/dataone/configuration/config.xml