Allow multiple volumes-from

This finishes the work started in #1465