codestyle fixes (from github.com based merge attempt)
codestyle fixes (from github.com based merge attempt)

eviljeff/olympia,eviljeff/olympia,mozilla/olympia,mozilla/addons-server,bqbn/addons-server,mozilla/addons-server,diox/olympia,bqbn/addons-server,diox/olympia,wagnerand/addons-server,wagnerand/addons-server,wagnerand/addons-server,diox/olympia,wagnerand/addons-server,mozilla/addons-server,mozilla/olympia,bqbn/addons-server,bqbn/addons-server,eviljeff/olympia,mozilla/olympia,eviljeff/olympia,mozilla/olympia,mozilla/addons-server,diox/olympia