Forward-port upgrade scripts from recent releases

In accordance with LP #894052.

berick: 2_3 script only

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Bill Erickson <berick@esilibrary.com>