Added Windows 10 (Server and workstation) to the marketing names version table.
Added changelog entry per @sersut review.
Merge pull request #2233 from juliandunn/windows-10

Added Windows 10 (Server and workstation) to the marketing names version table.