[integration] Fixes for DB installation

This patches two problems in creating the databases that we found while trying to install this version.

I presume all of the SQL should be commented out and these two things had been left behind by mistake?

Hi, this true, but this will be ignored from now on, so this solves the current problem but introduced a new one.