Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/rpc-tests/nodehandling.py

@@ -8,13 +8,10 @@
 #
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-import base64
+from test_framework.util import assert_equal, connect_nodes_bi, p2p_port
+
+import time
 
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
 try:
     import urllib.parse as urlparse
 except ImportError: