TRUNK-4530: Fix getDrugs to search for concept name or drug name

This change is needed only for 1.10.x
Thanks for doing this, i was about to mention that the getCountOfDrugs and getDrugs need to use the same code to construct the criteria object