Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  Rename queryd to luxid
  Document the rapi client not to have a QueryNetworks method
  Enable unit tests again
  Document ganeti-queryd
  Add ganeti-queryd to QA env test
  Add queryd daemon (split from confd)
  Extract ConfigReader from Confd/Server.hs
  Add timestamps to haskell network query fields

Conflicts:
	src/Ganeti/Confd/Server.hs (trivial)

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

diff --cc .gitignore
Simple merge

diff --cc INSTALL
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
index 32b9c15,e047f14..6e0e7a1
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -212,8 -243,9 +212,9 @@@ AC_ARG_WITH([user-prefix]
    [user_masterd="${withval}masterd";
     user_rapi="${withval}rapi";
     user_confd="${withval}confd";
+    user_luxid="${withval}luxid";
     user_noded="$user_default";
 -   user_mond="${withval}mond"],
 +   user_mond="$user_default"],
    [user_masterd="$user_default";
     user_rapi="$user_default";
     user_confd="$user_default";

diff --cc lib/constants.py
Simple merge

diff --cc src/Ganeti/Confd/Server.hs
index f05d3b5,3df6f42..a27e3e4
--- 1/src/Ganeti/Confd/Server.hs
--- 2/src/Ganeti/Confd/Server.hs
+++ b/src/Ganeti/Confd/Server.hs
@@@ -57,9 -52,6 +52,7 @@@ import Ganeti.ConfigReade
  import Ganeti.Hash
  import Ganeti.Logging
  import qualified Ganeti.Constants as C
- import qualified Ganeti.Path as Path
- import Ganeti.Query.Server (prepQueryD, runQueryD)
 +import qualified Ganeti.Query.Cluster as QCluster
  import Ganeti.Utils
  
  -- * Types and constants definitions

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

diff --cc src/Ganeti/Query/Server.hs
Simple merge

diff --cc tools/vcluster-setup.in
Simple merge