Merge 9.3 RC2

	both modified:   CHANGELOG.md
	both modified:   docker/openshift-template.json
	both added:      files/gitlab-cookbooks/gitlab-ee/recipes/pgbouncer.rb
	both modified:   files/gitlab-cookbooks/gitlab/libraries/prometheus.rb
	both modified:   spec/chef/gitlab-ee/recipes/geo-postgresql_spec.rb
	both modified:   spec/chef/recipes/prometheus_spec.rb
	both modified:   spec/libraries/omnibus_helper_spec.rb

assigned to @twk3

added 1 commit

• bdd28ac2 - Resolve conflicts with the merge from master into 9-3-stable

Compare with previous version

approved this merge request

mentioned in commit 942f3ac1

merged

@ClemMakesApps now you can merge 9-3-stable into 9-3-stable-ee