Merge "Use modern c++ code style for incidentd." into pi-dev
am: 56051569ab

Change-Id: Ifd36cb23ae185b8a37805deb6163e87a2e9ee1c9