Change in jenkins[master]: Refactor: Use macros in defaults file