Release/1.2.0 merge into develop

Normally I would just use the hubflow tools to merge any release branch changes into develop.  However, I want to keep the release branch open until @a8wright and Wei can test this release branch in all of our cloud environments.  I *think* this pull request will just cause release/1.2.0 changes to be merged into develop.