Changes

Summary

1. Merge the code from the 2.3 branch to trunk.

Revision 19699 by tao: Merge the code from the 2.3 branch to trunk.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn-buildout/dataone-cn-version-tool	dataone-cn-version-tool
	/software/cicore/trunk/cn-buildout/dataone-cn-version-tool/usr/share/dataone-cn-version-tool/version-tool.properties	dataone-cn-version-tool/usr/share/dataone-cn-version-tool/version-tool.properties