Merge remote-tracking branch 'jl/jl777' into momo

diff --cc src/chainparams.cpp
Simple merge

diff --cc src/komodo_bitcoind.h
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/miner.cpp
Simple merge

diff --cc src/rpcserver.cpp
Simple merge

diff --cc src/rpcserver.h
Simple merge