[tarsnap: 4/5] Merge branch 'el7'