Ensure proper ordering in linking negotiation

Conflicts:
	src/dcc.c
Merge branch 'maint-1.2' into maint-1.3

* maint-1.2:
  Ensure proper ordering in linking negotiation