Check for blockDeviceMapping
Merge pull request #18497 from techhat/blockDeviceMapping

Check for blockDeviceMapping