Further gradle/jenkins fixes