Merge changes from topic 'cp-cts' into oc-dev

* changes:
  Ignore an additional thread in test 911
  Add more cts tests
  Remove unneeded shims and jni binding code