Update Master to Export/UI Changes

Do you think we need to test this further?
Perceived complexity for to_solr_xml is too high. [14/7]<br>Inconsistent indentation detected.<br>Surrounding space missing in default value assignment.