Change in jenkins[master]: Re-factored system-tests builders