Merge "zuul: remove obsolete job definitions"