Merge branch 'next' into branch-2.1

* next:
  Fix another issue with hypervisor_name change
  Update NEWS and version for 2.0.2 release
  Improve the description of node flags in man page
  Add enabled hypervisors to TestConfigRunner
  Add a few more checks to verify config
  Make sure enabled_hypervisors list is valid
  Change default stripe count to 1
  Use full-stripe size in LVM growth
  Remove ConfigWriter.InitConfig
  RAPI: implement instance reinstall

Conflicts:

  test/ganeti.config_unittest.py
    529d13a43907dd3f5ab1814e52098f04c2a43f93 contained a small fix which
    was also present in 066f465dbc53dd8ae80442dfe2592602be1ac231

diff --cc configure.ac
Simple merge

diff --cc lib/bootstrap.py
Simple merge

diff --cc lib/cmdlib.py
Simple merge

diff --cc lib/config.py
Simple merge

diff --cc lib/rapi/baserlib.py
Simple merge

diff --cc lib/rapi/connector.py
Simple merge

diff --cc lib/rapi/rlib2.py
Simple merge

diff --cc man/gnt-node.sgml
Simple merge

diff --cc scripts/gnt-cluster
index b41a380,f154167..5e34201
--- 1/scripts/gnt-cluster
--- 2/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@@ -76,14 -88,11 +76,9 @@@ def InitCluster(opts, args)
    for hv in constants.HYPER_TYPES:
      if hv not in hvparams:
        hvparams[hv] = {}
 -    for parameter in constants.HVC_DEFAULTS[hv]:
 -      if parameter not in hvparams[hv]:
 -        hvparams[hv][parameter] = constants.HVC_DEFAULTS[hv][parameter]
 +    hvparams[hv] = objects.FillDict(constants.HVC_DEFAULTS[hv], hvparams[hv])
      utils.ForceDictType(hvparams[hv], constants.HVS_PARAMETER_TYPES)
  
-   for hv in hvlist:
-     if hv not in constants.HYPER_TYPES:
-       ToStderr("invalid hypervisor: %s", hv)
-       return 1
- 
    bootstrap.InitCluster(cluster_name=args[0],
                          secondary_ip=opts.secondary_ip,
                          vg_name=vg_name,