Merge pull request #21232 from calavera/consolidate_security_opts_format

Consolidate security options to use `=` as separator.