Fix OSGi component definition for smack-resolver-javax

The Service Component definition for resolver-javax is in
org.jivesofware.samck and not org.jivesoftware.smack*x*.

SMACK-576
Smack 4.0.2
Merge branch '4.0'

Conflicts:
	build.gradle
	smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java