merge the two include arrays

This makes the file more readable: all includes *and* deploys are in
the same place now.
1 job for merge-ci-templates in 12 seconds (queued for 2 seconds)