Some cleanup from downstream
Merge branch 'develop' into bitshares

Conflicts:
	libraries/api/wallet_api.json
	libraries/blockchain/include/bts/blockchain/config.hpp