Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my41-ndb

into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge


ndb/src/common/util/File.cpp:
  use local, only whitespace diff.  this has been applied to 5.0-ndb in some other way