Merge "Add missing uploadstash.us_props for PostgreSQL"