Fix building with jenkins

Change-Id: I06f9dc3b93c5839321c48a72d49e7ed6b35326b1
Merge remote-tracking branch 'Slim/jb4.3' into slim4.3