Change in jenkins[master]: Refactor system tests template