More Jenkins gem conflict fixes v3