Merge "Use modern c++ code style for incidentd." into pi-dev