Merge "Remove workaround for xmpp connection issue with OC4.1"