Improved default holdings_grouping (#991)

- Group holdings by holdings ID and location by default to accommodate a situation where the items under a single holding have multiple actual locations. This will not change anything in the more common case where there is a 1:1 correspondence between these values.