Allow composition of facts when grouping
Allow composition of facts when grouping

This is primarily to allow groupings like:

  {operatingsystem}_{operatingsystemrelease}

NeCTAR-RC/external_naginator,daniellawrence/external_naginator