Fix filelisting infinite loops

Related to #11804 but not sure it fixes it entirely
Merge branch 'fl' into develop

Conflicts:
	salt/fileserver/__init__.py