adding missed merge
Conflicts:
	be/src/runtime/buffered-block-mgr.cc