jrouge/WFU-3599/Prevent_infinite_loops_when_airbrake_creates_a_report___...

This is a sub-pull request.