Fix handling of cciss devices during OSD and journal discovery

Change-Id: I349c61c00045ad1d4d12c5e8d2e2751f8f642b4e
Closes-Bug: #1267304