FEND-966: Display Merops tables as XHTML tables
Merge branch 'master' into dev/merops-tables
Merge branch 'master' into dev/merops-tables
FEND-966: Display Merops tables as XHTML tables-removing commented out code
Merge remote-tracking branch 'origin/dev/merops-tables' into release/2.6.2rc