Simplify release_roles DSL logic
Merge pull request #1002 from rosenfeld/master

Simplify release_roles DSL logic