Merge "Move function xmlsafe() from Export.php to OAI extension"