Change in jenkins[master]: Fix some more issues with SDK jobs