Merge "Add additional workaround for odlparent-helium jacoco"