Conflicts:
	src/com/dotmarketing/cms/comment/action/CommentsAction.java
	src/com/dotmarketing/util/ServletResponseCharacterEncoding.java
	src/com/dotmarketing/velocity/VelocityServlet.java
Merge pull request #4959 from dotCMS/issue-4931-disable-arbitrary-redirect-master-merge

Conflicts: bring to master #4931