Merge remote-tracking branch 'upstream/master'
check ProductName instead of productId to get this registry test working in mono
Merge pull request #129 from dguder/mono-test

Mono test fix