Merge "Add -o loop= option to mount, and fix error detection in mount and umount"