fix for resolving of CombinedPackages

Basically, CombinedPackages were broken, as they woudn't resolve, due to the lack of a CombinedVariantResource class, to allow them to handle variants.  This adds such a subclass, and adds tests for basic resolving of combined pacakges.