[BUGFIX] Allow FlowContext to be used with PostgreSQL

Some variable renaming along the way...

Change-Id: Ic7b90eeb305754f49873422d0baf05002c7dba14
Merge branch 'postgresql-support'