Bug 1014791: Switching to use the find_by_cp_id method which will look
for engineering products first.
Merge pull request #3144 from ehelms/bug-1014791

Bug 1014791: Switching to use the find_by_cp_id method which will look