Issue #2348863 by D34dMan, juliangb: Fixed When clean url is not turned on, the redirection to update.php from PM person migration conflict resolve page fails.
Merge branch 'feature/redirect-without-clean-url' into 7.x-2.x