changes to carry diagnostic info over between master and lave
Authored by: pieterfourie 2015-02-16
Parent: [r32155]
Child: [r32157]