Merge "Fix issue in CSIT Job trigger for KV store"