Move a bit more stuff over to the datadir (issue #6967 reported by tzafrir patch...