Bug 1210503 - Fix bad merge
Bug 1210503 - Fix bad merge

Lost changes in bug 1187000 when this was merged the first time, so e10s
results were not visible.

kapy2010/treeherder,wlach/treeherder,KWierso/treeherder,avih/treeherder,akhileshpillai/treeherder,tojon/treeherder,wlach/treeherder,tojon/treeherder,sylvestre/treeherder,akhileshpillai/treeherder,gbrmachado/treeherder,parkouss/treeherder,gbrmachado/treeherder,parkouss/treeherder,tojon/treeherder,tojonmz/treeherder,akhileshpillai/treeherder,avih/treeherder,akhileshpillai/treeherder,glenn124f/treeherder,avih/treeherder,KWierso/treeherder,sylvestre/treeherder,edmorley/treeherder,kapy2010/treeherder,sylvestre/treeherder,akhileshpillai/treeherder,KWierso/treeherder,kapy2010/treeherder,gbrmachado/treeherder,avih/treeherder,kapy2010/treeherder,glenn124f/treeherder,tojon/treeherder,edmorley/treeherder,kapy2010/treeherder,edmorley/treeherder,wlach/treeherder,gbrmachado/treeherder,glenn124f/treeherder,gbrmachado/treeherder,tojonmz/treeherder,avih/treeherder,wlach/treeherder,parkouss/treeherder,tojonmz/treeherder,tojonmz/treeherder,wlach/treeherder,parkouss/treeherder,KWierso/treeherder,glenn124f/treeherder,sylvestre/treeherder,sylvestre/treeherder,avih/treeherder,glenn124f/treeherder,gbrmachado/treeherder,edmorley/treeherder,akhileshpillai/treeherder,sylvestre/treeherder,tojonmz/treeherder,glenn124f/treeherder,parkouss/treeherder,parkouss/treeherder,wlach/treeherder,tojonmz/treeherder