Merge proposals dependent on lp://qastaging/~bladernr/checkbox/checkbox-merge-ocp-block_device_resource

1. checkbox-merge-ocp-block_device_resource
2. Dependent merge proposals