fix issues with master.cf handling

* service name can now be used multiple times
* an master.cf entry is now specified by service-name + type