Fixed issue TRUNK - 4006, Cannot Unretire retired Encounter Types
Merge pull request #438 from rohitmukherjee/1.8.x

Fixed issue TRUNK - 4006, Cannot Unretire retired Encounter Types