update to upstream 1.21

A bit messy updating this. I have been running 1.21 for a few weeks now.
Works best with updated connectionagent.