robustify test_restart_master_long
Merge pull request #362 from Incubaid/robustify-test-restart-master-long

robustify test_restart_master_long