#6656
Merge branch 'master' of https://github.com/dotCMS/core
#6339: Adding Push to Properties and JSP
Merge pull request #6698 from dotCMS/6339-push-wording

#6339: Adding Push to Properties and JSP
Merge remote-tracking branch 'origin/master' into issue-6680-error-500-unpublish