Merge "Retrying for connection when postgres is not ready"