[#TRUNK-4169] Add added quantity and units properties to DrugIngredient