Merge pull request #998 from puppetlabs/revert-995-consolidate

Revert "(FM-7720/FM-7722/FM-7723) Consolidate Windows Metadata"

Author: tphoney

metadata.json

@@ -76,7 +76,9 @@
       "operatingsystem": "Windows",
       "operatingsystemrelease": [
         "2008",
+        "2008 R2",
         "2012",
+        "2012 R2",
         "2016",
         "7",
         "10"