Postgres: Adjustments for postgres datastore. Fixed tests
Added datastore query to discovery service
POSTGRES bumped submodules