Conflicts:
	test/com/dotcms/rest/ContentResourceTest.java
Conflicts:
	test/com/dotcms/rest/ContentResourceTest.java
Conflicts:
	src/com/dotcms/rest/ContentResource.java
	test/com/dotcms/rest/ContentResourceTest.java
Conflicts:
	src/com/dotcms/rest/ContentResource.java
	test/com/dotcms/rest/ContentResourceTest.java
#3819 some missing changes