Merge siva.hindu.god:/home/tsmith/m/bk/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)

storage/ndb/test/ndbapi/testNodeRestart.cpp

@@ -1459,7 +1459,7 @@ runBug27003(NDBT_Context* ctx, NDBT_Step* step)
 	return NDBT_FAILED;
       
       res.startNodes(&node, 1);
-      res.waitNodesStartPhase(&node, 1, 2);
+      NdbSleep_SecSleep(3);
       pos++;
     }
     pos = 0;