Merge branch 'next' into branch-2.1

* next:
  Remove SimpleConfigWriter.SetMasterNode
  _GenerateDiskTemplate: use base_index in the name
  ganeti-masterd: avoid SimpleConfigReader
  cmdlib: Fix typo in LUQueryClusterInfo

Conflicts:

	daemons/ganeti-masterd
	  RPC related conflict

Signed-off-by: Guido Trotter <ultrotter@google.com>