Merge branch 'devel-2.1'

* devel-2.1:
  burnin: implement basic confd testing
  AsyncUDPSocket.process_next_packet
  WaitForSocketCondition: rename, handle EINTR
  move http.WaitForSocketCondition to utils
  ConfdCountingCallback
  ConfdClient: add synchronous features
  Replace @keyword with @param in confd client
  AsyncUDPSocket: abstract do_read function
  Burnin: don't add/remove routed nics
  Only override any and all if not defined

Conflicts:
	lib/http/__init__.py
	trivial, double removal

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>