repool db1022 in S6. move db1039 to assist with upgrades in S7. depool db1007 for upgrade

Change-Id: Ie7aad70ae9a1165b85d1a36b5ece3227c5b676fc