Fixes bug 1032036, rebases and squashes commits to fix multilocale.test.js r=yurenju