TRUNK-3768: drugOrder.drug should not be a mandatory field for drug order

This was merged into master previously, now backporting for 1.9.3