pulling dbs for upgrades, returning others

Change-Id: I1f1dfbcfdcd1e6a58e30edc6db1623cee3f196d5