Merge "selinux: remove last slash in CE dirs macro"