Merge "Maintenance script for exporting site definitions"