AEROGEAR-977 "Refactor hasRoles"
Merge branch 'AEROGEAR-977-hasRoles-Refactoring'