Changes

Summary

1. Merge the 2.16 branch back to trunk.

Revision 20119 by tao: Merge the 2.16 branch back 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