Trunk 4446: Support deriving auto_expire_date from duration and duration units for Drug Orders

Changes for ticket https://issues.openmrs.org/browse/TRUNK-4446
Yes it did make sense to not check for null or empty string when addToDate was returning null but now you need not to