Change in jenkins[master]: Fix issue when cleaning up some interfaces