port autofs fix from master