Merge branch 'fix-avs-set-credential-diagnostic' into 'master'

Split SNMP/CLI credential action on diagnostic discovery.

See merge request !6777

(cherry picked from commit bb538413)

564e7e1f Split SNMP/CLI credential action on diagnostic discovery.
58c12383 Fix import.