DESCRIPTION

CBQE-4073/CBQE-4078:
Port the changes to spock as well, adjusted for index2 API

Change-Id: Ia1ead8329228828fa73b4e264c3cef6756378e18


COMMENTS

author: Jakobe Johnson
date: 2017-04-14 17:24:02.707000000

Patch Set 2: Patch Set 1 was rebased

-------------------------------------
author: Jakobe Johnson
date: 2017-04-14 17:24:22.461000000

Patch Set 2: Code-Review+2 Verified+1

Same code was approved to watson, pushing through to spock

-------------------------------------
