Fix bug 1367031 - Add the new config's after upgrading and restoring the old config.global.js.

Change-Id: I469955d5f7e8253235cb44f566c551f5a7bac2b2