SQL Database Create and Update fixes
Merge remote-tracking branch 'upstream/dev' into dev-sql-database-fix
Merge pull request #1969 from jeffwilcox/dev-sql-database-fix

SQL Database Create & Update Fix
RT fixes, etc.
Merge branch 'dev' into dev-rt-sql-fixes