Fixes for cert exchanges closes #1594

This fixes the immediate issue. There is a remaining issue with kscope ads sometimes not being delivered, which manifests itself as SSL errors, but we'll log that separately.