moving some riad check specific things to be with raid check def

Change-Id: I1b58abae71be80ff472935a7628f5285c173ef1e
Merge "moving some riad check specific things to be with raid check def" into production