Merge "drmserver: allow looking in efs_file directories"