Merge branch 'master', remote-tracking branch 'origin'
Ensure DocumentTag uses correct _get_key function

This makes sure that DocumentTag uses the _get_key function of its
associated AnnotatorTag inherited tag type. This is an effective but
inefficient fix related to the MedicationTag issues with type1 type2
interchangeability.