Merge branch '6.7' into 6.8

Author: Roberto E. Garcia

Source/MySql.Data/command.cs

@@ -874,11 +874,7 @@ private bool AddCallStatement(string query)
         keyword = keyword.Substring(0, indexChar);
 
       if (keywords == null)
-#if CF
         keywords = new List<string>(Resources.keywords.Replace("\r", "").Split('\n'));
-#else
-        keywords = new List<string>(Resources.keywords.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries));
-#endif
 
       return !keywords.Contains(keyword);
     }