skytools_upgrae: make force option work properly
Pgq: fix RetriableBatchWalker initialization