GDP-845

Includes Ivan's changes (merge conflict) and fixes some minor problems in PostgresDatabase and with the Rserve connection.