Improve selinux label handling 

Fixes #4936