Changes

Summary

1. Merge dataone-zookeeper branch 2.3 to trunk.

Revision 19697 by tao: Merge dataone-zookeeper branch 2.3 to trunk.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn-buildout/dataone-zookeeper	dataone-zookeeper
	/software/cicore/trunk/cn-buildout/dataone-zookeeper/DEBIAN/postinst	dataone-zookeeper/DEBIAN/postinst
	/software/cicore/trunk/cn-buildout/dataone-zookeeper/etc/init.d/zookeeper	dataone-zookeeper/etc/init.d/zookeeper