Merge branch 'master' into issue-5933-Get-WEB-INF-lib-Jars-and-Starter-out-of-github

Conflicts:
	dotCMS/WEB-INF/jsp/license/license.jsp
	dotCMS/WEB-INF/log4j/log4j.xml
	dotCMS/html/portlet/ext/osgi/bundles.jsp
	src/com/dotcms/rest/ClusterResource.java
	src/com/dotcms/rest/ContentResource.java
	src/com/dotcms/rest/EnvironmentResource.java
	src/com/dotcms/rest/RoleResource.java
	src/com/dotcms/rest/StructureResource.java
	src/com/dotcms/rest/UserResource.java
	src/com/dotcms/timemachine/ajax/TimeMachineAjaxAction.java
	src/com/dotmarketing/business/DotGuavaCacheAdministratorImpl.java
	src/com/dotmarketing/business/ajax/RoleAjax.java
	src/com/dotmarketing/portlets/structure/action/EditStructureAction.java
	src/com/dotmarketing/portlets/user/ajax/UserAjax.java
	src/com/dotmarketing/servlets/InitServlet.java
	src/com/dotmarketing/util/UtilMethods.java
	src/com/dotmarketing/velocity/VelocityServlet.java
	src/com/liferay/portal/servlet/MainServlet.java