[8.09] base-files: merge r17118, bump patchlevel