This change removes all of mistral from the expand_roles function by calling the required functions directly. Story: 2007212 Task: 38782 Change-Id: I07c1249571e1fe989d57427412c1aaa6ea1ff165 Signed-off-by: Kevin Carter <kecarter@redhat.com>