Better match downstream
Remove more extraneous references
Merge branch 'develop' into bitshares

Conflicts:
	libraries/blockchain/CMakeLists.txt
	libraries/blockchain/chain_database.cpp
Remove more extraneous references
Update fork timestamps