Merge "Move to ioctl whitelisting for plain files / directories"