HBASE-8900 TestRSKilledWhenMasterInitializing.testCorrectnessWhenMasterFailOver is flakey; PUTTING BACK THIS PATCH ON TRUNK