Merge with latest barge code
Add a delay to AppendLog tests to allow servers to start up