Improve puppet pe broker handoff

Various improvements to the PE broker handoff process.