Improved handling of TestStepTemplates selection in TestStep
Merge branch 'teststeptemplate' into beta