Merge pull request #3 from kobliha/master

As well as other pull requests on this topic.
Testsuite adapted to merging SuSEfirewall2 services into one