MB-14134: cbq-engine terminated with runtime panic
MB-14134: cbq-engine terminated with runtime panic

Change-Id: Iaa34e70ca2c04c8b36351c252c17b04a07911778

jchris/indexing,jchris/indexing,jchris/indexing,jchris/indexing