More SQL queries to move the new tables without dropping the old ones,
and allow to move the old ones in case the new tables fail.

Change-Id: I05704db7ca5500dab7cb046a0e7ae8a283eb13d5