* stable-2.8
  Version bump to 2.8.0~alpha1
  Make cfgupgrade idempotent
  Update config version number when downgrading
  Add test for shrink heuristics over different resources
  Improve hspace shrinking strategy
  Convenience function for iterating while the result is Ok
  Provide witness for the sum-type structure of GenericResult
  Disable more version checks for alpha versions
  Allow alpha versions not to have an entry in the NEWS file
  Add tests for check-news
  Introduce support for alpha versions
  Improve docstring
  Fix bug in Makefile.am
  Restructure documentation index page
  Add missing parenthesis to description of --machine-readable
  Update NEWS file for 2.8
  Add a --force option to gnt-cluster modify
  Add a force option to the ClusterSetParams Opcode
  Document the monitoring daemon in the admin guide
  Factor out the API of the monitoring daemon
  Add monitoring agent info to the security document
  Export device UUIDs to hooks and OS scripts
  gnt-cluster info: only parameters for enabled hypervisors
  Support RAPI QA on an already existing cluster

Conflicts:
	Makefile.am:
    Trivial, merge of lists of files.

	man/gnt-cluster.rst
    One parameter added in stable-2.8, one in master

	test/hs/shelltests/htools-hspace.test
    Tests added in both branches

	tools/cfgupgrade
    Some upgrade steps are not required anymore, some have been removed.

  src/Ganeti/HTools/Instance.hs
    Some types changes in the Haskell code because of the patches related to
    Ganeti Dedicated.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>