Merge branch 'master' into pending_rolling_updates

README.md

manifests/complete-postgres-manifest.yaml

manifests/configmap.yaml

pkg/cluster/cluster.go

pkg/cluster/k8sres.go

pkg/cluster/pod.go

pkg/cluster/sync.go

pkg/cluster/util.go

pkg/controller/controller.go

pkg/controller/util.go

pkg/spec/postgresql.go

pkg/spec/postgresql_test.go

pkg/util/config/config.go