fix missing etc-pristine entries
Merge branch '1.12'