bug-18781: Ensuring all files have correct copyright notices.
Merge branches 'db_redesign' and 'bug-18781' into db_redesign