Build/Test Tools: Adjust how the 6.8 branch is included in matrices.