backports/lsyncd: 2.1 from edge