FORGE-730: annotation order enhancements
Merge pull request #251 from mbenson/annotationOrder

FORGE-730: annotation order enhancements