This change sets switches the implementation of the collection store
from the No-op collection store to the simple collection store.

Change-Id: I38e5e1d8c25ad260eb6077e3aee9ff8f4f9c3664
Signed-off-by: yacovm <yacovm@il.ibm.com>