Merge "fugu: remove automount from fstab" into lmp-dev