[upstream] Get us back to upstream master(f93c96c)

[brirams]

Overview

We'd like to get back to tracking upstream master but also have a commit that we care about that is already included in tinyspeck so this does the following:

$ git checkout slack-vitess-2019-04-02.r0
$ git checkout -b slack-vitess-2019-07-31.r0
$ git push origin head
$ git checkout -b bramos_force_upstream_f93c96c
$ git merge f93c96c738d7d5bbbcdc03c828f8bf0a5ba16250

The list of commits generated yesterday is still relevant:

git log bf603d53ce1593b46d6a93fc756ed1d682b39eb0...f93c96c738d7d5bbbcdc03c828f8bf0a5ba16250 --name-only > commits.txt

I pored through these commits to grab the most relevant ones, ignoring changes to:

• docs
• examples
• helm/docker configs
• tests and test data
• tracer plugins

There are a lot left over(286 commits) but I think it's much easier to eyeball this way.

Testing

https://jenkins.tinyspeck.com/job/slack-vitess/346/

[rafael]

These ones I think we should keep an eye:

• beb8415
  e85b8aa

[rafael]

LGTM

[brirams]

Going to do the following so we can force a new master:

git checkout tinyspeck/master
git tag slack-vitess-2019.08.04
git reset --hard slack-vitess-2019-07-31.r0
git push -f origin HEAD:master