Merge "Revert "Strictly check for SELinux labelling errors""