bug 1127532 - remove block device (kept too much during merge)
bug 1127532 - remove block device (kept too much during merge)

jdotpz/socorro-infra,peterbe/socorro-infra,phrawzty/socorro-infra,rhelmer/socorro-infra,peterbe/socorro-infra,rhelmer/socorro-infra,peterbe/socorro-infra,rhelmer/socorro-infra,mozilla/socorro-infra,phrawzty/socorro-infra,phrawzty/socorro-infra,mozilla/socorro-infra,mozilla/socorro-infra,jdotpz/socorro-infra