Merge branch 'master' into fo-6418-dont-export-bigint

# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs

rpc/src/v1/impls/eth.rs

@@ -26,7 +26,7 @@ use time::get_time;
 use bigint::prelude::U256;
 use bigint::hash::{H64, H160, H256};
 use util::Address;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use ethash::SeedHashCompute;
 use ethcore::account_provider::{AccountProvider, DappId};

rpc/src/v1/impls/eth_filter.rs

@@ -24,7 +24,7 @@ use ethcore::miner::MinerService;
 use ethcore::filter::Filter as EthcoreFilter;
 use ethcore::client::{BlockChainClient, BlockId};
 use bigint::hash::H256;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use futures::{future, Future, BoxFuture};
 

rpc/src/v1/impls/eth_pubsub.rs

@@ -40,7 +40,8 @@ use light::on_demand::OnDemand;
 use light::client::{LightChainClient, LightChainNotify};
 use parity_reactor::Remote;
 use bigint::hash::H256;
-use util::{RwLock, Mutex, Bytes};
+use util::Bytes;
+use parking_lot::{RwLock, Mutex};
 
 type Client = Sink<pubsub::Result>;
 

rpc/src/v1/impls/light/eth.rs

@@ -40,7 +40,7 @@ use ethsync::LightSync;
 use rlp::UntrustedRlp;
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
 use bigint::prelude::U256;
-use util::{RwLock, Mutex};
+use parking_lot::{RwLock, Mutex};
 
 use futures::{future, Future, BoxFuture, IntoFuture};
 use futures::sync::oneshot;

rpc/src/v1/impls/pubsub.rs

@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use util::RwLock;
+use parking_lot::RwLock;
 
 use futures::{self, BoxFuture, Future, Stream, Sink};
 use jsonrpc_core::{self as core, Error, MetaIoHandler};

rpc/src/v1/impls/signer.rs

@@ -24,7 +24,7 @@ use ethkey;
 use futures::{future, BoxFuture, Future, IntoFuture};
 use parity_reactor::Remote;
 use rlp::UntrustedRlp;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use jsonrpc_core::{futures, Error};
 use jsonrpc_pubsub::SubscriptionId;

rpc/src/v1/impls/signing.rs

@@ -19,7 +19,7 @@
 use std::sync::Arc;
 use transient_hashmap::TransientHashMap;
 use bigint::prelude::U256;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use ethcore::account_provider::AccountProvider;