[infra] Mocknet tweaks

Son of Odinrequested to merge
mocknet into master

Various tweaks getting churn working on a mocknet network.

Merge request reports