Merge branch 'cs/#6953-code-quality-improvements'

Close #6953
Update classmap_generator.php

Fixes the spacing inside of the return array(). Currently the output generates 2 spaces where it should be 4
Merge branch 'hotfix/#6594-spacing-in-classmap-generator' into develop

Close #6594
Forward port #6594