Merge "Enforce linear strategy for orchestrate-devstack"