Revert "#829 - changes Dispensing encounter type to Medication dispensed encounter type."

This reverts commit 5eae11671cc2112eb249b42efcf22190f2f43e1a.
Revert "Revert "#829 - changes Dispensing encounter type to Medication dispensed encounter type.""

This reverts commit 408f201cf81ae5b88126de93541062da1028a562.

This revert leaves the change of uuid out since it was a mistake.