Fixes Bug 921281 - Groups product and version appropriately for per-install data.

Anyone r?