PCI-3066 - backporting secgroup patch to Folsom