DRAFT/WIP Update Smack to 4.0.0