3.4: Switch back to folks master, disable introspection in libgnomekbd

We're building libxklavier with no introspection, so we can't
enable it in libgnomekbd.

gnomeos/3.4/manifest.json

@@ -510,7 +510,8 @@
 		 "branch": "v.5.2",
 		 "config-opts": ["--disable-introspection"]},
 
-		{"src": "gnome:libgnomekbd"},
+		{"src": "gnome:libgnomekbd",
+		 "config-opts": ["--disable-introspection"]},
 
 		{"src": "fd-pulse:pulseaudio",
 		 "branch": "v0.9.23",
@@ -654,7 +655,6 @@
 		 "config-opts": ["--enable-eds-backend",
 		                 "--disable-Werror",
 		                 "--disable-fatal-warnings"],
-		 "branch": "wip/vala-0-15",
 		 "patches": ["folks-builddir.patch",
 			     "folks-config-fatal-warnings.patch"]},