rename CS-4605 upgrade sql script
fix critical CS-4632 - when publication alias is not in url
fix recursion on displaying error message - CS-4632
remove useless code - exception here is ok
Merge remote-tracking branch 'pawel/fix_CS-4605_upgrade_script' into v4.1