Merge branch 'stable-2.6' into devel-2.6

* stable-2.6:
  QA: Use instance name for rename test

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>