fixes #4519 Cannot set image to null on existing contents
Merge branch 'master-2.5' of github.com:dotCMS/dotCMS into master-2.5