fix(builder): restore VOLUME instruction so builder does not stack overlay filesystems

This addresses #1993 and reverts most of #1984.