Add ext/ stub-friendly packages [#71612062]

Signed-off-by: Georg Apitz <georg@pivotallabs.com>
Fix heartbeat problems

[#72292488]

Signed-off-by: Johannes Petzold <jpetzold@pivotallabs.com>