Refactor organization labels for API
Fix label validation
Merge pull request #295 from CruGlobal/MH-847

Mh 847