Merge "Make DiscreteRegistry react only to offsetHistory() calls made as TestApi call. Initialize DiscreteRegistry first as it doesn't depend on HistoricalRegistry." into sc-dev