Merge "Ensure one jacoco output file"