Merge branch 'stable-2.5' into devel-2.5

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc doc/rapi.rst
Simple merge

diff --cc lib/backend.py
Simple merge

diff --cc lib/cmdlib.py
Simple merge

diff --cc lib/opcodes.py
Simple merge

diff --cc lib/rapi/client.py
Simple merge

diff --cc lib/rapi/rlib2.py
Simple merge

diff --cc lib/utils/io.py
Simple merge

diff --cc test/ganeti.rapi.client_unittest.py
Simple merge