Unit test and the fix for the DegraderImpl rollver deadlock

RB=345140