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

Conflicts:
	dotCMS/WEB-INF/lib/ee-911505c8d4.jar
	src/com/dotmarketing/util/UpdateUtil.java