Merge "Fix tests on jenkins, take 2." into lmp-dev