Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status

* it's broken with later features, resetState()
* fixed resetState() to make it work with this PR

Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Pipeline.java
	src/main/java/redis/clients/jedis/Transaction.java
	src/main/java/redis/clients/jedis/TransactionBlock.java

src/main/java/redis/clients/jedis/TransactionBlock.java

@@ -2,6 +2,12 @@ package redis.clients.jedis;
 
 import redis.clients.jedis.exceptions.JedisException;
 
+@Deprecated
+/**
+ * This class is deprecated due to its error prone
+ * and will be removed on next major release
+ * @see https://github.com/xetorthio/jedis/pull/498
+ */
 public abstract class TransactionBlock extends Transaction {
 	// For shadowing
 	@SuppressWarnings("unused")