BISERVER-10435: More tags and updates for enunciate
Merge pull request #293 from wseyler/dev

BISERVER-10435: More tags and updates for enunciate