CONTRIB-5028: clean up HTML markup better using if tidy not available