Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Return the correct error code in the post-upgrade script
  Make openssl refrain from DH altogether
  Fix upgrades of instances with missing creation time

Conflicts:
	cfgupgrade_unittest.py: merge version tests
	tools/post-upgrade: return the correct error code for SSH
	                    renewal as well

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Lisa Velden <velden@google.com>

diff --cc src/Ganeti/Constants.hs
Simple merge

diff --cc tools/cfgupgrade
Simple merge

diff --cc tools/post-upgrade
index 08ade62,d625360..530124b
--- 1/tools/post-upgrade
--- 2/tools/post-upgrade
+++ b/tools/post-upgrade
@@@ -57,15 -59,9 +59,17 @@@ def main()
      if result.failed:
        cli.ToStderr("Failed to create node certificates: %s; Output %s" %
                     (result.fail_reason, result.output))
+       error_code = 1
  
 +  if utils.version.IsBefore(version, 2, 13, 0):
 +    result = utils.RunCmd(["gnt-cluster", "renew-crypto",
 +                           "--new-ssh-keys", "--no-ssh-key-check", "-f"])
 +    if result.failed:
 +      cli.ToStderr("Failed to create SSH keys: %s; Output %s" %
 +                   (result.fail_reason, result.output))
++      error_code = 1
 +
-   return 0
+   return error_code
  
  if __name__ == "__main__":
    exit(main())