SWITCHYARD-1948 - Fix for security properties