CC-4865: Password reset -> Cancel -> url is missing base directory

-fixed
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel