Changes

Summary

1. Merge the change from branch to trunk.

Revision 20130 by tao: Merge the change from branch to trunk.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn-buildout/dataone-cn-rest-service	dataone-cn-rest-service
	/software/cicore/trunk/cn-buildout/dataone-cn-rest-service/DEBIAN/control	dataone-cn-rest-service/DEBIAN/control