Merge branch 'hotfix/#6634-allow-crossorigin-headscript-attribute'

Close #6634
#7012 - removing incompatible PHP 5.4 syntax from test script