master merge #5793 quoting json data

Conflicts:
	src/com/dotcms/rest/RoleResource.java