Fix guest plugin for RH & SUSE
Merge pull request #1283 from eladroz/master

Fixing guest code for RH & SUSE