More Jenkins gem conflict fixes v2