Many changes and cleanup associated with SPRINT#3.
History service fixes.