Merge pull request #648 from anandpdoshi/anand-wip-4.1

Fixes in Website Route system and other misc fixes
Call update route in after rename only if condition field is enabled