OS-3518 disklayout could special-case storage count=5