Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py

var/spack/repos/builtin/packages/dbus/package.py

@@ -22,7 +22,8 @@ class Dbus(Package):
     def install(self, spec, prefix):
         configure(
             "--prefix=%s" % prefix,
-            "--disable-systemd")
+            "--disable-systemd",
+            "--disable-launchd")
         make()
         make("install")