NOW-33 More changes to make circleci work