Support pipelines started manually via UI in workflow rules

We had specified push as the only pipeline source to start a branch pipeline - this is unnecessary.

Also reorders the jobs so that branch pipelines are together.