Fixed upgrading.
Merge pull request #1747 from cmfcmf/routesmodule-upgrading

Fixed upgrade process with the new RoutesModule