Auto-reconfigure after change-merged event

Rather than respond to the internal report of a change merging,
respond to the change-merged event from the trigger, that way
we will still reconfigure when a change is merged out-of-band.

Change-Id: I684273cad495da7b937f7b80917c7869a0e173d3
4 files changed