Merge master into develop & Set version to 2.2.0-develop

[rodrigok]

No description provided.

[bkraul]

So hey, what's with this commit? Is it safe to use in the develop image? I notice it says it is Release 2.1.1. Later it says that it bumps to 2.2.0-develop but there is nothing in any of the changed files that reflects this:

Then again, maybe I am not understanding how develop syncs work? My concern is a version regression.

[rodrigok]

@bkraul we don't do tags while in develop, so the tag will always point to the latest stable release on develop branch.

We released 2.2.0-rc.0 yesterday, so I had to merge our 2.1.1 release back to develop (because we released it using cherry-picks) to prevent merge conflicts (since both branches had the same changes) to then create the release candidate for 2.2.0.