Merge branch 'release/7.x-1.17' into develop
fix cart when logging in using reset link
update version
Merge branch 'release/7.x-1.17.1'