#6226 #6227


Former-commit-id: 55dd230f3af3675eb364a376c2890d97cee006cd
#6224
Merge remote-tracking branch 'remotes/origin/master' into issue-6227-6226-6224-license-changes
#6224
#6224
#6224
Merge pull request #6322 from dotCMS/issue-6227-6226-6224-license-changes

Issue 6227 6226 6224 license changes