Comment 2 for bug 817727

Thank you for your submission.
I modified your patch a bit:
- changed the name of the config parameter to be more descriptive
- moved the code activating the contact, so it will be force-activated only if it actually was added to roster