fix syntax error in upgrade script
Merge branch 'devel' into 2.3.x-saas