adding current_machine to resolution
tweaking couple of code review suggestions
Merge pull request #62 from elyast/hotfix/1.3.0_ip_resolver

Allow ip resolver to know for which vm other current vm's IP is being resolved
Merge branch 'hotfix/1.3.0_ip_resolver'
Merge remote-tracking branch 'upstream/master'