Fix marshalling of domain controller discovery options

The marshalling code for domain controller discovery options currently assumes that any static-discovery elements will be provided before any discovery-option elements and writes the discovery options to the XML file in this order. This needs to be fixed since static-discovery and discovery-option elements can actually be provided in any order, any number of times. The discovery options need to be written to the XML file in the order they were provided in.