revert to single role per service

we will no longer need *-master and *-client roles for each service