Fix for 'Server Error' with integration-tests on CI. (#11169)
Fix for 'Server Error' with integration-tests on CI. (#11169)

* Fix for 'Server Error' with integration-tests on CI.

* Fix for codestyle.

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