diff --git a/mozilla/testing/performance/talos/bcontroller.py b/mozilla/testing/performance/talos/bcontroller.py
index 5bbee5e3f6d..3fe2f93e926 100644
--- a/mozilla/testing/performance/talos/bcontroller.py
+++ b/mozilla/testing/performance/talos/bcontroller.py
@@ -51,7 +51,7 @@ import getopt
 import stat
 
 if platform.system() == "Linux":
-    platform_type = 'unix_'
+    platform_type = 'linux_'
 elif platform.system() in ("Windows", "Microsoft"):
     import win32pdh
     import win32api
@@ -59,7 +59,7 @@ elif platform.system() in ("Windows", "Microsoft"):
     import win32con
     platform_type = 'win_'
 elif platform.system() == "Darwin":
-    platform_type = 'unix_'
+    platform_type = 'mac_'
 
 
 class BrowserWaiter(threading.Thread):
@@ -100,7 +100,7 @@ class BrowserController:
     self.timeout = 600 #no output from the browser in 10 minutes = failure
 
   def run(self):
-    self.bwaiter = BrowserWaiter(self.command, self.log, self.mod) 
+    self.bwaiter = BrowserWaiter(self.command, self.log, self.mod)
     noise = 0
     prev_size = 0
     while not self.bwaiter.hasTime():
@@ -143,20 +143,20 @@ def main(argv=None):
 
    if argv is None:
         argv = sys.argv
-   opts, args = getopt.getopt(argv[1:], "c:t:n:p:l:m:", ["command=", "timeout=", "name=", "child_process=", "log=", "mod="]) 
-        
+   opts, args = getopt.getopt(argv[1:], "c:t:n:p:l:m:", ["command=", "timeout=", "name=", "child_process=", "log=", "mod="])
+
    # option processing
    for option, value in opts:
      if option in ("-c", "--command"):
-       command = value 
+       command = value
      if option in ("-t", "--timeout"):
        timeout = int(value)
      if option in ("-n", "--name"):
-       name = value 
+       name = value
      if option in ("-p", "--child_process"):
        child_process = value
      if option in ("-l", "--log"):
-       log = value 
+       log = value
      if option in ("-m", "--mod"):
        mod = value
 
diff --git a/mozilla/testing/performance/talos/mobile.config b/mozilla/testing/performance/talos/mobile.config
index 3a6c6482711..c8b89ab277a 100755
--- a/mozilla/testing/performance/talos/mobile.config
+++ b/mozilla/testing/performance/talos/mobile.config
@@ -26,7 +26,7 @@ buildid: testbuildid
 init_url: getInfo.html
 
 # Preferences to set in the test (use "preferences : {}" for no prefs)
-preferences : 
+preferences :
   browser.EULA.override : true
   security.fileuri.strict_origin_policy : false
   browser.shell.checkDefaultBrowser : false
@@ -47,7 +47,7 @@ preferences :
 
 # Extensions to install in test (use "extensions: {}" for none)
 # Need quotes around guid because of curly braces
-# extensions : 
+# extensions :
 #     "{12345678-1234-1234-1234-abcd12345678}" : c:\path\to\unzipped\xpi
 #     foo@sample.com : c:\path\to\other\unzipped\xpi
 extensions : {}
@@ -59,7 +59,7 @@ dirs:
   components : page_load_test/components
 
 # Environment variables to set during test (use env: {} for none)
-env : 
+env :
   NO_EM_RESTART : 1
 # Tests to run
 #  url         : (REQUIRED) url to load into the given firefox browser
@@ -69,11 +69,13 @@ env :
 #  timeout     : (OPTIONAL) how many seconds the test can run before we consider it failed and quit (default 8 hours)
 #  pagetimeout : (OPTIONAL) how many seconds each page is allowed to take before considered to be frozen (default 8 hours)
 #            Must be used in conjuction with the pageloader with the -tpnoisy option
-#  counters    : (REQUIRED) types of system activity to monitor during test run, can be empty 
+#  counters    : (REQUIRED) types of system activity to monitor during test run, can be empty
 #            For possible values of counters argument on Windows, see
 #            http://technet2.microsoft.com/WindowsServer/en/Library/86b5d116-6fb3-427b-af8c-9077162125fe1033.mspx?mfr=true
-#            Possible values on Linux and Mac:
+#            Possible values on Mac:
 #            counters : ['Private Bytes', 'RSS']
+#            Possible values on Linux:
+#            counters : ['Private Bytes', 'RSS', 'XRes']
 #            Standard windows values:
 #            counters : ['Working Set', 'Private Bytes', '% Processor Time']
 
@@ -81,125 +83,137 @@ env :
 # the format is seen in the regular expressions in ttest.py
 # to see how the data passed from the browser is processed see send_to_graph and send_to_csv in run_tests.py
 tests :
-- name: ts 
+- name: ts
   url : startup_test/startup_test.html?begin=
   url_mod : str(int(time.time()*1000))
-  resolution : 1 
+  resolution : 1
   cycles : 10
   timeout: 300
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : True
-  profile_path: base_profile 
-- name: ts_places_generated_max              
+  profile_path: base_profile
+- name: ts_places_generated_max
   url : startup_test/startup_test.html?begin=
-  url_mod : str(int(time.time()*1000))                       
-  resolution : 1                                                   
-  cycles : 10                                
-  timeout: 150                               
-  win_counters : []                          
-  unix_counters : []                                                    
-  shutdown : True                                                                                                
-  profile_path: places_generated_max                                                 
-- name: ts_places_generated_min                             
-  url : startup_test/startup_test.html?begin=                                                                          
-  url_mod : str(int(time.time()*1000))                                                          
-  resolution : 1                                                       
-  cycles : 10                                                                                                               
-  timeout: 150                                                                                  
-  win_counters : []                                                                             
-  unix_counters : []                                                                            
-  shutdown : True                                                                               
-  profile_path: places_generated_min                                                            
-- name: ts_places_generated_med                                                                                  
-  url : startup_test/startup_test.html?begin=                                                   
-  url_mod : str(int(time.time()*1000))                                                                        
-  resolution : 1                                                                                
-  cycles : 10                                                                                   
-  timeout: 150                                                                                  
-  win_counters : []                                                                             
-  unix_counters : []                                                                            
-  shutdown : True                                                                               
-  profile_path: places_generated_med 
-- name: tp4 
+  url_mod : str(int(time.time()*1000))
+  resolution : 1
+  cycles : 10
+  timeout: 150
+  win_counters : []
+  linux_counters : []
+  mac_counters : []
+  shutdown : True
+  profile_path: places_generated_max
+- name: ts_places_generated_min
+  url : startup_test/startup_test.html?begin=
+  url_mod : str(int(time.time()*1000))
+  resolution : 1
+  cycles : 10
+  timeout: 150
+  win_counters : []
+  linux_counters : []
+  shutdown : True
+  profile_path: places_generated_min
+- name: ts_places_generated_med
+  url : startup_test/startup_test.html?begin=
+  url_mod : str(int(time.time()*1000))
+  resolution : 1
+  cycles : 10
+  timeout: 150
+  win_counters : []
+  linux_counters : []
+  mac_counters : []
+  shutdown : True
+  profile_path: places_generated_med
+- name: tp4
   url :  '-tp page_load_test/tp4.manifest -tpchrome -tpnoisy -tpformat tinderbox -tpcycles 3'
   resolution : 20
   cycles : 1
   pagetimeout : 700
   win_counters : ['Working Set', 'Private Bytes', '% Processor Time']
-  unix_counters : [ 'Private Bytes', 'RSS']
+  linux_counters : [ 'Private Bytes', 'RSS', 'XRes']
+  mac_counters : [ 'Private Bytes', 'RSS']
   timeout : 14400
   shutdown : True
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tdhtml
   url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpnoisy -tpformat tinderbox -tpcycles 3'
   resolution : 1
   cycles : 1
   pagetimeout : 300
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tgfx
   url: '-tp page_load_test/gfx/gfx.manifest -tpchrome -tpnoisy -tpformat tinderbox -tpcycles 3 -tprender'
   resolution : 1
   cycles : 1
   pagetimeout : 300
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tsvg
   url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpnoisy -tpformat tinderbox -tpcycles 3'
   resolution : 1
   cycles : 1
   pagetimeout : 300
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: twinopen
   url: startup_test/twinopen/winopen.xul?phase1=20
   resolution: 1
   cycles : 1
   timeout : 300
   win_counters: []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tjss
   url: '-tp page_load_test/jss/jss.manifest -tpchrome -tpnoisy -tpformat tinderbox -tpcycles 1'
   resolution : 1
   cycles : 1
   pagetimeout : 300
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tsspider
   url: '-tp page_load_test/sunspider/sunspider.manifest -tpchrome -tpnoisy -tpformat tinderbox -tpcycles 3'
   resolution : 1
   cycles : 1
   pagetimeout : 400
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tpan
   url: startup_test/fennecmark.html?test=PanDown
   resolution: 1
   cycles : 10
   timeout : 300
   win_counters: []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile
 - name: tzoom
   url: startup_test/fennecmark.html?test=Zoom
   resolution: 1
   cycles : 10
   timeout : 300
   win_counters: []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
-  profile_path: base_profile 
+  profile_path: base_profile