Automatic merge from submit-queue (batch tested with PRs 40971, 41027, 40709, 40903, 39369) Set docker opt separator correctly for SELinux options This is based on @pmorie's commit from #40179