Fixed patch 22 to apply on new smack trunk/head
Fixed patch 22 to apply on new smack trunk/head

lizhangqu/asmack,lizhangqu/asmack,tks-dp/asmack,chuangWu/asmack,tks-dp/asmack,ZachGoldberg/asmack,chuangWu/asmack,ZachGoldberg/asmack,lovecc0923/asmack,Flowdalic/asmack,lovecc0923/asmack,Flowdalic/asmack