Merge branch 'v2.1-dev' into 'v2.x-master'

Update CommonLoginController.java

See merge request !12
3 jobs for v2.x-master in 3 minutes and 14 seconds (queued for 50 seconds)