Fixes Bug 921281 - Groups product and version appropriately for per-install data.
Merge pull request #1631 from brandonsavage/bug921281-per-install

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