Merge branch 'devel-2.1'

* devel-2.1:
  burnin: only remove instances we actually added
  burnin.ExecOrQueue: add post-process function
  burnin.ExecOrQueue: remove variable argument list
  Fix new pylint errors
  Rename the confd_client unittest (to confd.client)
  Make watcher request the max coverage
  ConfdClient.SendRequest: allow max coverage
  Document the watcher node maintenance feature
  Watcher: automatic shutdown of orphan resources
  Export the maintain_node_health option in ssconf
  Add a new cluster parameter maintain_node_health
  Add a new confd callback (StoreResultCallback)
  ConfdClient: add synchronous wait for replies mode
  ConfdClient: unify some internal variables

Conflicts:
	daemons/ganeti-masterd
	  change moved to luxi.py

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