Bug #2771: Fix oneflow recover after a failed scaling
Report monitoring error if datastores are not found

(cherry picked from commit 40455376b7655678659a0ea06b628f92d3b43bf1)
Bug #2772: Fix onedb syntax for ruby < 1.9
(cherry picked from commit 246ace7072ec36ce0dfe697b1d1a48f1544a60d1)

Conflicts:
	src/onedb/import_slave.rb
	src/onedb/shared/4.4.1_to_4.5.80.rb
Merge remote-tracking branch 'upstream/one-4.4' into one-4.4