Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next