Rolling Logistics Pipes forward

Looks like I caught them halfway through implementing a feature.

2-DEV-136 will be used to cut 2.8.3.6 releases.