Cannot save a v2.4.0 Layer Definition document via "Edit as XML"

[jng]

When you open a v2.4.0 Layer Definition document and then use the "Edit as XML" command to edit the raw XML. Maestro will throw this error when saving the XML document:

System.Xml.Schema.XmlSchemaValidationException: Type 'WatermarkInstanceCollectionType' is not declared.
   at System.Xml.Schema.XmlSchemaValidator.SendValidationEvent(XmlSchemaValidationException e, XmlSeverityType severity)
   at System.Xml.Schema.XmlSchemaValidator.SendValidationEvent(XmlSchemaException e)
   at System.Xml.Schema.XmlSchemaValidator.RecompileSchemaSet()
   at System.Xml.Schema.XmlSchemaValidator.Init()
   at System.Xml.Schema.XmlSchemaValidator..ctor(XmlNameTable nameTable, XmlSchemaSet schemas, IXmlNamespaceResolver namespaceResolver, XmlSchemaValidationFlags validationFlags)
   at System.Xml.XsdValidatingReader.SetupValidator(XmlReaderSettings readerSettings, XmlReader reader, XmlSchemaObject partialValidationType)
   at System.Xml.XsdValidatingReader..ctor(XmlReader reader, XmlResolver xmlResolver, XmlReaderSettings readerSettings, XmlSchemaObject partialValidationType)
   at System.Xml.XmlReaderSettings.AddValidation(XmlReader reader)
   at System.Xml.XmlReaderSettings.CreateReader(Stream input, Uri baseUri, String baseUriString, XmlParserContext inputContext)
   at System.Xml.XmlReader.Create(Stream input, XmlReaderSettings settings, String baseUri)
   at OSGeo.MapGuide.MaestroAPI.XmlValidator.Validate(Stream xml, XmlSchema[] xsds) in c:\working\JenkinsCI\home\slave_win\jobs\Maestro 5.0.x\workspace\OSGeo.MapGuide.MaestroAPI\XmlValidator.cs:line 81
   at OSGeo.MapGuide.MaestroAPI.XmlValidator.ValidateResourceXmlContent(String xmlContent, String xsdPath, String[]& errors, String[]& warnings) in c:\working\JenkinsCI\home\slave_win\jobs\Maestro 5.0.x\workspace\OSGeo.MapGuide.MaestroAPI\XmlValidator.cs:line 126
   at Maestro.Base.Editor.XmlEditorDialog.ValidateXml(String[]& errors, String[]& warnings) in c:\working\JenkinsCI\home\slave_win\jobs\Maestro 5.0.x\workspace\Maestro.Base\Editor\XmlEditorDialog.cs:line 140
   at Maestro.Editors.Generic.XmlEditorCtrl.PerformValidation(Boolean silentSuccess, Boolean errorsOnly) in c:\working\JenkinsCI\home\slave_win\jobs\Maestro 5.0.x\workspace\Maestro.Editors\Generic\XmlEditorCtrl.cs:line 246
   at Maestro.Base.Editor.XmlEditorDialog.btnSave_Click(Object sender, EventArgs e) in c:\working\JenkinsCI\home\slave_win\jobs\Maestro 5.0.x\workspace\Maestro.Base\Editor\XmlEditorDialog.cs:line 150
   at System.Windows.Forms.Control.OnClick(EventArgs e)
   at System.Windows.Forms.Button.OnClick(EventArgs e)
   at System.Windows.Forms.Button.OnMouseUp(MouseEventArgs mevent)
   at System.Windows.Forms.Control.WmMouseUp(Message& m, MouseButtons button, Int32 clicks)
   at System.Windows.Forms.Control.WndProc(Message& m)
   at System.Windows.Forms.ButtonBase.WndProc(Message& m)
   at System.Windows.Forms.Button.WndProc(Message& m)
   at System.Windows.Forms.Control.ControlNativeWindow.OnMessage(Message& m)
   at System.Windows.Forms.Control.ControlNativeWindow.WndProc(Message& m)
   at System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)

[jng]

Fixed trunk (r7914) and 5.0.x (r7915)