merge @xiaolu temporary fixes for selinux context backup/restore