chore: fixes for intermittent test failures#9517

matthewmcneely merged 12 commits intomaindgraph-io/dgraph:mainfrom

matthewmcneely/fixes-for-intermittent-test-failuresdgraph-io/dgraph:matthewmcneely/fixes-for-intermittent-test-failuresCopy head branch name to clipboard