Bug 1056173 - Fix minor nits found by gaia-linter.