fixing upgrade script if order is not set
Merge remote-tracking branch 'origin/master' into webserver.js-refactor