MDL-40337 fix some more deprecated calls in role code