merging <servicehelper> from a included config file

[Krzysztof Konopko]

<servicehelper> is not supported in the included config file, i. e. it's
not merged in merge_included(). I'm wondering if there's any particular
reason for that.

IMHO there's clearly no reason it shouldn't be supported as <user>,
<type> and others are merged. It's quite reasonable for a client wanting
to override the default servicehelper, e. g. in system-local.conf.

I proposed a patch which is included in a bug I filed:
https://bugs.freedesktop.org/show_bug.cgi?id=51560

I've been using this patch in a commercial product (YouView set top box)
for quite a while now and it works fine and seems reasonable to me. We
leave the default configuration file intact and do our crazy stuff in
the session-local.conf (don't ask why it's session rather than system -
it's a long non-technical story).

Could you guys have a look?

Thanks,
Kris

P. S.
Apologise for the "confidential transmission" footer. I'm working on
getting rid of it.
This transmission contains information that may be confidential and contain personal views which are not necessarily those of YouView TV Ltd. YouView TV Ltd (Co No:7308805) is a limited liability company registered in England and Wales with its registered address at YouView TV Ltd, 3rd Floor, 10 Lower Thames Street, London, EC3R 6YT. For details see our web site at http://www.youview.com