Make Jenkins Compliant

Change-Id: I7e978b0048081756f40a6193b0cd1c9d92609eed