More improvements to munki related roles