Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Fix tests for setting (shared) file storage directory
  Add missing call for setting shared file storage directory
  Update ganeti-luxid synopsis
  Update ganeti-mond synopsis
  Update ganeti-confd synopsis
  Update copyright statement

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

diff --cc lib/cmdlib/cluster.py
Simple merge

diff --cc test/py/cmdlib/cluster_unittest.py
Simple merge