Merge branch '6414-php-warning' into 'develop'

Fix var name issue crippling vhost_rewrite_v6?

Closes #6414

See merge request !1663
1 job for develop in 9 seconds (queued for 4 seconds)