#6010: trim scheme name
Merge pull request #6068 from dotCMS/issue-6010-trim-scheme-name

#6010: trim scheme name