#4123
#4124
Merge pull request #4125 from dotCMS/issue-4123-Content-can-not-moved-on-remote-server

Issue 4123 content can not moved on remote server
#4123
Merge branch 'master-2.5' of https://github.com/dotCMS/dotCMS into issue-4115-push-host

Conflicts:
	dotCMS/WEB-INF/lib/ee-667cf8b8.jar
#4115 new ee.jar