old_contents: from collector import Collector
  from active_tasks import ActiveTasks
  from atop import Atop
  from iostat import IO
  from latency import Latency
  from observe import ObserveLatency
  from net import Net
  from ns_server import NSServer
  from secondary_stats import SecondaryStats
  from n1ql_stats import N1QLStats
  from ps import PS
  from typeperf import TypePerf
  from spring_latency import SpringLatency,SpringSubdocLatency, SpringQueryLatency, \
      SpringN1QLQueryLatency
  from sync_gateway import SyncGateway
  from xdcr_lag import XdcrLag
  
  
new_contents: from collector import Collector
  from active_tasks import ActiveTasks
  from atop import Atop
  from iostat import IO
  from latency import Latency
  from observe import ObserveLatency
  from net import Net
  from ns_server import NSServer
  from secondary_stats import SecondaryStats
  from secondary_debugstats import SecondaryDebugStats
  from secondary_latency import SecondaryLatencyStats
  from n1ql_stats import N1QLStats
  from ps import PS
  from typeperf import TypePerf
  from spring_latency import (SpringLatency, SpringQueryLatency,
                              SpringSubdocLatency, SpringSpatialQueryLatency,
                              SpringN1QLQueryLatency)
  from sync_gateway import SyncGateway
  from xdcr_lag import XdcrLag
  
subject: Revert "CBD: 1686 cbagent changes for cbagent"