Fixes #6758 : Resolve 3.1 build issues.
Merge pull request #6761 from dotCMS/issue-6758-resolve-3_1-build-issues

Fixes #6758 : Resolve 3.1 build issues.