Merge "Fix mistaken removal of setfilecon"