Changes

Summary

1. merged 2.3 branch to trunk. (pom.xml differences regarding servlet version and war-plugin exclusions not brought inn).

Revision 19975 by rnahf: merged 2.3 branch to trunk.  (pom.xml differences regarding servlet version and war-plugin exclusions not brought inn).
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_rest	d1_cn_rest
	/software/cicore/trunk/cn/d1_cn_rest/src/main/java/org/dataone/cn/rest/v1/IdentityController.java	d1_cn_rest/src/main/java/org/dataone/cn/rest/v1/IdentityController.java
	/software/cicore/trunk/cn/d1_cn_rest/src/main/java/org/dataone/cn/rest/v2/IdentityController.java	d1_cn_rest/src/main/java/org/dataone/cn/rest/v2/IdentityController.java