Merge "Refactor of use of fstab in advance of fix."