GPII-658: Fix acceptance tests in pilots2 branch

In Linux, all tests are passing well just by adding the changes from https://github.com/GPII/linux/pull/46