Re-register our beans if we have to restart agent on failed exec.
Merge remote-tracking branch 'github/master'