Merge "Drop odd decapod-pipelines from defaults"