move salt:gitfs and salt:master to role/saltmaster
    
    This part of the pillar data is only needed for the saltmaster role,
    so it should live there (not in common.sls)
    
    This is a pure move without any changes to the pillar data.