Merge branch 'hotfix/#6391-missing-test-properties-in-url-helper-test'

Close #6391
unused parameters $sm for plugins factory
Merge branch 'hotfix/#6393-removed-unused-parameter-in-view-helper-manager-factory' into develop

Forward port #6393