Changes

Summary

1. Merge code from branch 2.3 to the trunk

Revision 19702 by tao: Merge code from branch 2.3 to the trunk
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn-buildout/dataone-cn-processdaemon	dataone-cn-processdaemon
	/software/cicore/trunk/cn-buildout/dataone-cn-processdaemon/DEBIAN/postinst	dataone-cn-processdaemon/DEBIAN/postinst
	/software/cicore/trunk/cn-buildout/dataone-cn-processdaemon/etc/dataone/process/log4j.properties	dataone-cn-processdaemon/etc/dataone/process/log4j.properties
	/software/cicore/trunk/cn-buildout/dataone-cn-processdaemon/etc/init.d/d1-processing	dataone-cn-processdaemon/etc/init.d/d1-processing
	/software/cicore/trunk/cn-buildout/dataone-cn-processdaemon/usr/share/dataone-cn-processdaemon/debian/synchronization.properties	dataone-cn-processdaemon/usr/share/dataone-cn-processdaemon/debian/synchronization.properties