Merge "Update zuul queue configuration"