Changes

Summary

1. Merge the changes on the 1.5 branch back to trunk.

Revision 20116 by tao: Merge the changes on the 1.5 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
	/software/cicore/trunk/cn-buildout/dataone-cn-metacat/DEBIAN/postinst	dataone-cn-metacat/DEBIAN/postinst
	/software/cicore/trunk/cn-buildout/dataone-cn-metacat/etc/dataone/storage/hazelcast.xml	dataone-cn-metacat/etc/dataone/storage/hazelcast.xml
	/software/cicore/trunk/cn-buildout/dataone-cn-metacat/usr/share/metacat/debian/log4j2.properties	dataone-cn-metacat/usr/share/metacat/debian/log4j2.properties