Merge branch 'features/cflags' into develop

Conflicts:
	lib/spack/spack/cmd/find.py
	var/spack/repos/builtin/packages/ghostscript/package.py

var/spack/repos/builtin.mock/packages/multimethod/package.py

@@ -103,19 +103,19 @@ def has_a_default(self):
     #
     # Make sure we can switch methods on different architectures
     #
-    @when('=x86_64')
+    @when('arch=x86_64')
     def different_by_architecture(self):
         return 'x86_64'
 
-    @when('=ppc64')
+    @when('arch=ppc64')
     def different_by_architecture(self):
         return 'ppc64'
 
-    @when('=ppc32')
+    @when('arch=ppc32')
     def different_by_architecture(self):
         return 'ppc32'
 
-    @when('=arm64')
+    @when('arch=arm64')
     def different_by_architecture(self):
         return 'arm64'