master merge #5793 quoting json data

Conflicts:
	src/com/dotcms/rest/RoleResource.java
Merge pull request #5796 from dotCMS/issue-5793-role-portlet-apostrophe-masterMerge

master merge #5793 quoting json data