Merge branch 'devel-2.1'

* devel-2.1:
  Fix path in ganeti-rapi man page
  Adjust message in case ~/.ssh is no directory

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>