Merge "Addition of XML support to test_console_output.py"