Remove unused attribute serviceName and re-number schema
    
    serviceName was originally part of the HBAC rules. We dropped it
    to use a separate service object instead so we could more easily
    do groups of services in rules.