Changes

Summary

1. Merge 2.16 branch to trunk.

Revision 20124 by tao: Merge 2.16 branch to trunk.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn-buildout/dataone-cn-metacat	dataone-cn-metacat
	/software/cicore/trunk/cn-buildout/dataone-cn-metacat/DEBIAN/control	dataone-cn-metacat/DEBIAN/control
	/software/cicore/trunk/cn-buildout/dataone-cn-metacat/etc/dataone/storage/hazelcast.xml	dataone-cn-metacat/etc/dataone/storage/hazelcast.xml