[master/rhel7-branch] DASD storage re-write, take III