Merge "Skip multipackage collection tests if there isn't another package to check" into sc-v2-dev