Merge proposals dependent on lp://staging/~zaber/stock-logistic-flows/zaber-stock-logistic-flows-6.1

1. zaber-stock-logistic-flows-6.1
2. Dependent merge proposals