refs #6619. Add options to wikimaker.
refs #6623 #6148 #6619. Generate Junit report.
refs #6623 #6146 #6619. Generate Junit report.
refs #6623 #6146 #6619. Fix UTF8 issue.
refs #6623 #6146 #6619. 2.6 UTF8 issue.
refs #6623. Put diff into report.
refs #6623. Output generator.
refs #6623. Fix format error.
refs #6146 fix conflicts