Initial fixes to refactoring
Merge branch 'webapps-refactor' of github.com:mykmelez/mozilla-central into webapps-refactor