TRUNK-4436: Drug orders for different formulations of the same concept

This is a fix for https://issues.openmrs.org/browse/TRUNK-4436
Am merging the code and making some changes to the unit tests, so don't worry about it