Merge "Add nofail fstab option"