And matching ImportOrder settings for Eclipse in resources/eclipse/smack.importorder
Use Manager pattern for PubSubManager. Also improve the API of ServiceDiscoverManager.