Range-diff !508

back to !508 e2e: robust wait for gitbayd to listen