Revert "SEC-2547: Consistent CAS client version"

This reverts commit f6cc9d87d5d85d8ea4c01696cbcd6f88ff558dca.
SEC-2558: Fix failing ApacheDSContainerTests when port is taken
correct loading of login page in openid-jc sample
Revert "correct loading of login page in openid-jc sample"

This reverts commit 46bb6256093d5ed4a488e599be85fe99472d2704.
Merge branch 'master' of https://github.com/spring-projects/spring-security
correct the login page loading in openid-jc sample