Fixed issue in unrecognized xvd* block devices by nailgun (Closes PRD-1995)

Change-Id: I4edb637a915b2ae33dd76737e4cf6506b7b8952a
Merge "Fixed issue in unrecognized xvd* block devices by nailgun (Closes PRD-1995)"