[JENKINS-7280] Allow filtering of run parameters - tidy up imports