Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"

This reverts commit c3259e9c26.

Reverted by agreement.

OpenSim/Region/Application/ConfigurationLoader.cs

@@ -83,7 +83,7 @@ namespace OpenSim
             List<string> sources = new List<string>();
 
             string masterFileName =
-                    startupConfig.GetString("inimaster", "config-include/OpenSimDefaults.ini");
+                    startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
 
             if (masterFileName == "none")
                 masterFileName = String.Empty;