Merge "[N->O] Fix wrong database connection for cell0 during upgrade." into stable...