PIM-3219 : fix jenkins builds
PIM-3219 : fix travis builds