1015944 - make sure we search for marketing products by cp_id

When the an engineering product is not foudn by cp_id, we still
want to give it a try for marketing products.
Merge pull request #3101 from iNecas/bz/b1015944

1015944 - make sure we search for marketing products by cp_id