In an effort to reduce the number of gates, we can combine
non-conflicting jobs as we have already done with pep8 and bashate

TrivialFix

Change-Id: I81c2e523c563f8c761b57c8f20ca807d59da5d68