More Jenkins gem conflict fixes