Merge branch 'devel-2.1'

Signed-off-by: Luca Bigliardi <shammash@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc daemons/ganeti-noded
Simple merge

diff --cc lib/errors.py
Simple merge

diff --cc lib/utils.py
Simple merge