Merge "Add in-repo zuul config"