Add --storage-opt daemon option and some devicemapper option (with fixes)

Closes #6213