SWITCHYARD-1753 - Fixes for security policy configuration