Quit the database session at end of database setup
Merge pull request #8197 from bbodenmiller/patch-14

Quit the database session at end of database setup