Only split roles if they are not None.

Change-Id: I2fbfbd6f6b1c898f7032744f9411821d5d97048c
Signed-off-by: Ian Main <imain@redhat.com>
Fixes: bug #1136891