fix session connection

previous session flushing fix caused conflict between database_connection
and [database]connection values. correct the behaviour in this fix.

also, remove empty return statement at end of record_metering_data function.

Change-Id: I3b2525cec05f5ee2ee8277bfbdca52b9a768974b
Merge "fix session connection"