Merge "Handle missing namespace prefix in XML dumps more gracefully"