Change: Fix windows bios inventory

Fix inclusion of PSComputername into System manufacturer
Add System serial number and System version support

Ref: https://dev.cfengine.com/issues/6378
Merge pull request #316 from nickanderson/3.6.x

Change: Fix windows bios inventory