Bug 981943 - Add database close to upgrade error in clock database. Fix event name typo.
Merge pull request #17047 from qdot/981943-clock-database-fix

Bug 981943 - Add database close to upgrade error in clock database. Fix ...