Move UpdateTime to pow
Move CBlockIndex::GetBlockWork() to pow::GetProofIncrement(nBits)
replace ComputeMinWork with CheckMinWork
Bypass reloading blocks from disk
Merge pull request #4764

92bb6f2 Bypass reloading blocks from disk (Pieter Wuille)
Merge pull request #4377

654871d replace ComputeMinWork with CheckMinWork (jtimon)
b343c1a Move CBlockIndex::GetBlockWork() to pow::GetProofIncrement(nBits) (jtimon)
c2c02f3 Move UpdateTime to pow (jtimon)
Fix build with DEBUG_LOCKORDER

Fixes #4771
qt/splashscreen: #include version.h

Needed to build breakage reported by Arnavion on IRC:
qt/splashscreen.cpp: In constructor 'SplashScreen::SplashScreen(const QPixmap&, Qt::WindowFlags, bool)':
qt/splashscreen.cpp:33:98: error: 'FormatFullVersion' was not declared in this scope
Merge remote-tracking branch 'bitcoin/master'

* Some refactoring of pow.cpp