Merge pull request #157 from KurtStam/master

https://bugzilla.redhat.com/show_bug.cgi?id=1053683 rhqPluginName no lon...
https://bugzilla.redhat.com/show_bug.cgi?id=1053683 rhqPluginName no longer hardcoded