Merge branch '4.1'

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java

@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.pubsub;
 import org.jivesoftware.smackx.xdata.Form;
 
 /**
- * Generic packet extension which represents any pubsub form that is
+ * Generic stanza(/packet) extension which represents any pubsub form that is
  * parsed from the incoming stream or being sent out to the server.
  * 
  * Form types are defined in {@link FormNodeType}.

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java

@@ -163,7 +163,7 @@ public class LeafNode extends Node
      * Get items persisted on the node.
      * <p>
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the packet extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
      * </p>
      * 
      * @param additionalExtensions additional {@code PacketExtensions} to be added to the request.
@@ -209,7 +209,7 @@ public class LeafNode extends Node
 	 * and {@link ConfigureForm#isDeliverPayloads()}=false.
 	 * 
 	 * This is an asynchronous call which returns as soon as the 
-	 * packet has been sent.
+	 * stanza(/packet) has been sent.
 	 * 
 	 * For synchronous calls use {@link #send() send()}.
 	 * @throws NotConnectedException 
@@ -231,7 +231,7 @@ public class LeafNode extends Node
 	 * publishes an event with NO item.
 	 * 
 	 * This is an asynchronous call which returns as soon as the 
-	 * packet has been sent.
+	 * stanza(/packet) has been sent.
 	 * 
 	 * For synchronous calls use {@link #send(Item) send(Item))}.
 	 * 
@@ -254,7 +254,7 @@ public class LeafNode extends Node
 	 * list will get stored on the node, assuming it stores the last sent item.
 	 * 
 	 * This is an asynchronous call which returns as soon as the 
-	 * packet has been sent.
+	 * stanza(/packet) has been sent.
 	 * 
 	 * For synchronous calls use {@link #send(Collection) send(Collection))}.
 	 * 

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java

@@ -158,7 +158,7 @@ abstract public class Node
      * Get the subscriptions currently associated with this node.
      * <p>
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the packet extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
      * </p>
      *
      * @param additionalExtensions
@@ -200,11 +200,11 @@ abstract public class Node
      * </p>
      * <p>
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the packet extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
      * </p>
      *
      * @param additionalExtensions
-     * @param returnedExtensions a collection that will be filled with the returned packet extensions
+     * @param returnedExtensions a collection that will be filled with the returned stanza(/packet) extensions
      * @return List of {@link Subscription}
      * @throws NoResponseException
      * @throws XMPPErrorException
@@ -255,7 +255,7 @@ abstract public class Node
      * Get the affiliations of this node.
      * <p>
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the packet extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
      * </p>
      *
      * @param additionalExtensions additional {@code PacketExtensions} add to the request

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java

@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.pubsub;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 /**
- * A packet extension representing the <b>options</b> element. 
+ * A stanza(/packet) extension representing the <b>options</b> element. 
  * 
  * @author Robin Collier
  */

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java

@@ -50,7 +50,7 @@ public class PubSub extends IQ
 	/**
     * Returns the XML element name of the extension sub-packet root element.
     *
-    * @return the XML element name of the packet extension.
+    * @return the XML element name of the stanza(/packet) extension.
     */
     @SuppressWarnings("static-method")
     public String getElementName() {
@@ -66,7 +66,7 @@ public class PubSub extends IQ
     /**
      * Returns the XML representation of a pubsub element according the specification.
      * 
-     * The XML representation will be inside of an iq packet like
+     * The XML representation will be inside of an iq stanza(/packet) like
      * in the following example:
      * <pre>
      * &lt;iq type='set' id="MlIpV-4" to="pubsub.gato.home" from="gato3@gato.home/Smack"&gt;

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java

@@ -24,7 +24,7 @@ import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Parses the root pubsub packet extensions of the {@link IQ} packet and returns
+ * Parses the root pubsub stanza(/packet) extensions of the {@link IQ} stanza(/packet) and returns
  * a {@link PubSub} instance.
  * 
  * @author Robin Collier