Fix issue with NC client segfaulting.
EUCA-6538
Merge branch 'dev/chuck/NC' into maint/3.3/testing