DDBNEXT-1262: Fix Bug with removing role facet
Merge branch 'DDBNEXT-1262-BOZ' into develop