CRA-655 Remove more warnings from Jenkins