Conflicts:
	daemons/ganeti-noded
	lib/daemon.py
	lib/rapi/baserlib.py
	lib/rapi/rlib2.py
	lib/utils.py

Signed-off-by: Luca Bigliardi <shammash@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>