#3966 master merge 1
#3966 master merge 2
#3966 we will allow duplicate names so don't need this
Conflicts:
	sql/cms/dotcms_extra_mysql.sql
	sql/cms/dotcms_extra_oracle.sql
	sql/cms/dotcms_extra_postgres.sql
	src/com/dotmarketing/util/TaskLocatorUtil.java
Merge pull request #4008 from dotCMS/issue-3966-master-merge

Issue 3966 master merge