Patch to properly avoid future types of data stored in the tsdb table in preparation for 2.0. Annotations will be stored with a 3 byte qualifier in the same row with their associated timeseries. For backwards compatibility, if a user tries 2.0 and decides to downgrade, or run an instance of 1.1 alongside 2.0, they can do so without affecting their data. This patch allows for proper compaction of cell data and leaves future types alone.