Backport database package enhancements from Framework
Merge pull request #1998 from mbabker/fwDatabase

Backport database package enhancements from Framework