Adding inventory_os.description for a human-friendly OS name, use sys.flavor as fallback, not default

(cherry picked from commit b432c42f8ebbc11054cb6f5fee4a30ea4df56d06)

Conflicts:
	promises.cf