Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

OpenSim/Region/Application/OpenSim.cs

@@ -159,6 +159,7 @@ namespace OpenSim
 
             MainConsole.Instance = m_console;
 
+            LogEnvironmentInformation();
             RegisterCommonAppenders(Config.Configs["Startup"]);
             RegisterConsoleCommands();
 

OpenSim/Region/Application/OpenSimBase.cs

@@ -138,10 +138,6 @@ namespace OpenSim
         /// <param name="configSource"></param>
         public OpenSimBase(IConfigSource configSource) : base()
         {
-            // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
-            // XmlConfigurator calls first accross servers.
-            m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
-
             LoadConfigSettings(configSource);
         }