Fix CC thread segfault
EUCA-7233
Merge branch 'dev/chuck/CCBUG2' into maint/3.3/testing