Robust way to define product and added Competition Entries and Quote Retrieved as a conversion

Added a more robust way of finding the product for Datacollector, and added Competition Entries and Quote Retrieved as a conversion.


Note: we took the current online version (V161) and made changes on that. That is what you see in this branch.