Merge "Add unified fstab support to release tools"