Upgrade ImportDatabaseJob to perform RenameDatabase as a last step

Upgrade ImportDatabaseJob to perform RenameDatabase as a last step