* origin/stable-2.1:
  Fix bug introduced in commit 413b7472
  Fix locking bug causing high CPU usage
  Fix confd procotol design description
  Implement instance rename QA tests
  Fix "gnt-instance rename" functionality

Reviewed-by: Guido Trotter <ultrotter@google.com>