Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/rpc-tests/keypool.py

@@ -6,18 +6,17 @@
 # Exercise the wallet keypool, and interaction with wallet encryption/locking
 
 # Add python-bitcoinrpc to module search path:
+
+from test_framework.authproxy import JSONRPCException
+from test_framework.util import check_json_precision, initialize_chain, \
+    start_nodes, start_node, stop_nodes, wait_bitcoinds, bitcoind_processes
+
 import os
 import sys
-
-import json
 import shutil
-import subprocess
 import tempfile
 import traceback
 
-from test_framework.util import *
-
-
 def check_array_result(object_array, to_match, expected):
     """
     Pass in array of JSON objects, a dictionary with key/value pairs