#2498: login page changes
Merge remote-tracking branch 'origin/release'