Fix esx inventory. references #2185
Fix license info. references #2249

Conflicts:
	inc/computerlicenseinfo.class.php
Fix MS Office collect key. closes #2249

Conflicts:
	phpunit/AllTests.php