Merge "Remove non-apache job from gate jobs"