Changes

Summary

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

Revision 19698 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-solr	dataone-solr
	/software/cicore/trunk/cn-buildout/dataone-solr/DEBIAN/postinst	dataone-solr/DEBIAN/postinst