Merge pull request #3005 in SNORT/snort3 from ~SVLASIUK/snort3:wizard_options_move...

Merge pull request #3005 in SNORT/snort3 from ~SVLASIUK/snort3:wizard_options_move to master

Squashed commit of the following:

commit 4781785cec1ec20013758611cea6628db253d5c2
Author: russ <rucombs@cisco.com>
Date:   Thu May 6 09:54:51 2021 -0400

    wizard: add wizard max_pattern option and update HTTP/SIP aware methods patterns

commit a80b39187048cbab9bdcb70d59273aff773c7bff
Author: russ <rucombs@cisco.com>
Date:   Thu May 6 12:59:33 2021 -0400

    smtp: remove unused defines

commit 2bc14ed5ebee6aa818b60959432e0f22fb7651e3
Author: russ <rucombs@cisco.com>
Date:   Thu May 6 13:00:16 2021 -0400

    telnet: correct help for ayt_attack_thresh

commit c695c3092b7ef955e81de6090c6d6683e1946195
Author: russ <rucombs@cisco.com>
Date:   Thu May 6 13:00:57 2021 -0400

    ftp: remove unused defines and crufty comments