Fix to avoid conflicts in requesting multiple Catalyst pipelines.

Change-Id: I86f074844960b924d0f62ad7255d626f05d3e55f
Merge topic '14717_catalyst_pipelines' into next

3755dffa Fix to avoid conflicts in requesting multiple Catalyst pipelines.