fix(apis): intermediate improvements ...

... it shows that the override I used previously won't work for `admin`.
Therefore we have to keep the actual value, instead of degenrating it.

Makes sense ... it's interesting how much one tends to hard-code things
to work just for a few cases, unless you opt in to see the whole picture

etc/api/api-list.yaml

@@ -8,6 +8,8 @@ api:
     adexchangeseller:
     - v2.0
     admin:
+    - directory_v1
+    - email_migration_v2
     - reports_v1
     adsense:
     - v1.4

etc/api/groupssettings/v1/groupssettings-api_overrides.json

@@ -0,0 +1,3 @@
+{
+	"name": "groupsSettings"
+}

etc/api/shared.yaml

@@ -10,20 +10,17 @@ directories:
   mako_src: src/mako
 api:
   blacklist:
-    - groupsmigration
-    - licensing
-    - groupssettings
-    - translate
+    - groupsmigration # no oauth2
+    - licensing # no oauth2
+    - translate # no oauth2
     - pagespeedonline # no oauth2
     - gan # no oauth2
-    - sqladmin # ERROR
-    - dataflow # ERROR
+    - dataflow # no oauth2
     - civicinfo # no oauth2
     - webmasters # no oauth2
     - doubleclickbidmanager # no oauth2
     - freebase # ERROR
     - spectrum # no oauth2
-    - analytics # ERROR
     - qpxexpress # no oauth2
     - discovery # no oauth2
     - identitytoolkit # no oauth2

etc/api/sqladmin/v1beta4/sqladmin-api_overrides.json

@@ -0,0 +1,3 @@
+{
+	"activity_root": "sql"
+}

etc/bin/mako-render

@@ -321,16 +321,16 @@ def cmdline(argv=None):
     # end for each input file
 
 # From http://stackoverflow.com/questions/7204805/dictionaries-of-dictionaries-merge
+# But: We overwrite leafs unconditionally
 def merge(a, b, path=None):
     if path is None: path = []
     for key in b:
         if key in a:
             if isinstance(a[key], dict) and isinstance(b[key], dict):
                 merge(a[key], b[key], path + [str(key)])
-            elif a[key] == b[key]:
-                pass # same leaf value
             else:
-                raise Exception('Conflict at %s' % '.'.join(path + [str(key)]))
+                # overwrite leafs unconditionally !
+                a[key] = b[key]
         else:
             a[key] = b[key]
     return a