ncreasing clean up retry since the control node verification is failing in scale testing

Change-Id: Id1769dc6626335f9737618f62d522b5129df3755
Merge "ncreasing clean up retry since the control node verification is failing in scale testing" into R2.0