Now also preventing to override "files" dir size with -1

Fixes #6526

Backport of 5be4af9 to stable6