Introduce halt_on_upgrade_failure app env param and set it to true. Only throw an error instead of halting if it has been set to false.
Ooops.
Merge bug25901
stable to default