Merge branch 'fix-avs-none-hostname' into 'master'

Fix error when hostname None value.

See merge request !6402

(cherry picked from commit 31e99c96)

2faf685b Fix error when hostname None value.
6 jobs for !6409 with cherry-pick-31e99c96 in 14 minutes and 39 seconds (queued for 13 seconds)
latest merge request