fix broken merge commit that removed running audit2allow
Merge remote branch 'origin/feature-conditional' into merged