Merge pull request #7670 from UtahDave/develop

Add fileinput to list of Windows modules to freeze
Add get_computer_desc