Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  (no changes)

* stable-2.10
  Substitute 'suffix' for 'revision'
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

doc/design-upgrade.rst

@@ -160,7 +160,7 @@ gnt-cluster upgrade
 The actual upgrade process will be done by a new command ``upgrade`` to
 ``gnt-cluster``. If called with the option ``--to`` which take precisely
 one argument, the version to
-upgrade (or downgrade) to, given as full string with major, minor, suffix,
+upgrade (or downgrade) to, given as full string with major, minor, revision,
 and suffix. To be compatible with current configuration upgrade and downgrade
 procedures, the new version must be of the same major version and
 either an equal or higher minor version, or precisely the previous