#18 unify XmppCommon to Common