Fixes security configuration to allow for more flexibility with project specific conf
Merge branch 'fix-security-config'