Fixes: #478978: Notices when no role is selected
Initial development branch for 6.x
Initial release for 6.x