Pick fixes into release-0.11#669

SuperQ merged 2 commits intorelease-0.11prometheus-community/postgres_exporter:release-0.11from

superq/0.11.1prometheus-community/postgres_exporter:superq/0.11.1Copy head branch name to clipboard