Merge branch 'deployment-annotations' into 'master'

Enforce pod priority class and s2i rollouts

See merge request !141
2 jobs for master in 4 minutes and 21 seconds (queued for 1 second)