LP1288938 - final adjustments for 0870 upgrade script

These were missed from the original and resulted in the fix not being complete.

Signed-off-by: Ben Shum <bshum@biblio.org>