fixes #7834 - properly process incoming and updated hypervisors

changed unneeded map to each

changed 'if' style on code

rebased

rubocop fix
Merge pull request #4708 from thomasmckay/7834-hypervisors

fixes #7834 - properly process incoming and updated hypervisors