FL-1729: backport tmpfiles changes from upstream