Merge "ExportTest: Simplify code that failed on 5.3 because of reserved word 'namespace'"