Merge branch 'fix-avs-discovery-id-typo' into 'master'

Fix DiscoveryID typo for None hostname.

See merge request !6412

(cherry picked from commit 417c1f19)

7a0c0b28 Fix DiscoveryID typo for None hostname.