Simplify CK2ProtocolClient to have a single completion method
Merge branch 'v2.x-beta' into resume