RT#17599: display cancelled services from history [bug fixes, v3 merge]