Fixes #6830 - Add host search on compute_resource_id used in 1.5 auth migrations
(cherry picked from commit 48c69213e70e1bc697b4a5487652549a8757a7a0)
Fixes #6830 - Add host search on compute_resource_id used in 1.5 auth migrations
(cherry picked from commit 48c69213e70e1bc697b4a5487652549a8757a7a0)