backport from trunk (rev #9714)

fixed double entry for xcap_client