Merge branch 'next.autofs' into work.dcache