Bug 846079 - cleanup / lint stuff

Obsoleting https://github.com/mozilla-b2g/gaia/pull/8388 and rebasing merge conflicts against master.