Fix Bug #20382

[adedommelin-zz]

Output was inconsistent when the "virt-what" package is installed, returning openvz instead of openvzve.

[puppetcla]

CLA signed by all contributors.

[adrienthebo]

Thank you very much for this contribution!

First off, it looks like you filed this pull request against your master branch. Because of this you have two unrelated commits in this pull request, the one for 20382 and another for 20297. You'll want to create separate branches for each pull request to avoid this. https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md#making-changes explains our branching strategy for things like this.

Lastly it looks like the change for openvz has caused a regression that was caught in Travis-ci: (https://travis-ci.org/puppetlabs/facter/jobs/9046358#L2173) by the test https://github.com/puppetlabs/facter/blob/master/spec/unit/util/virtual_spec.rb#L305 . I'm not terribly sure why this is happening and I'll look into it shortly, but I wanted to give you an early heads up about this issue.

[adrienthebo]

Oh, sorry, one more thing: we have a preferred format for commit messages to make git history more readable that's explained at (https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md#making-changes), could you give that a read and see if that could be applied to this pull request?