REVIEW-2097: some cleanup on jacoco integrationtests.