Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractAuthenticationManager.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/DirectMappingAuthenticationManagerImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/principal/AbstractWebApplicationService.java
	cas-server-core/src/main/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationService.java
	cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicket.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
	cas-server-core/src/main/java/org/jasig/cas/web/support/CasArgumentExtractor.java
	cas-server-core/src/test/java/org/jasig/cas/ticket/ServiceTicketImplTests.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsService.java
	checkstyle-rules.xml
Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractAuthenticationManager.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/DirectMappingAuthenticationManagerImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/principal/AbstractWebApplicationService.java
	cas-server-core/src/main/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationService.java
	cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicket.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
	cas-server-core/src/main/java/org/jasig/cas/web/support/CasArgumentExtractor.java
	cas-server-core/src/test/java/org/jasig/cas/ticket/ServiceTicketImplTests.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsService.java
	checkstyle-rules.xml
Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractAuthenticationManager.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/DirectMappingAuthenticationManagerImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/principal/AbstractWebApplicationService.java
	cas-server-core/src/main/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationService.java
	cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicket.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
	cas-server-core/src/main/java/org/jasig/cas/web/support/CasArgumentExtractor.java
	cas-server-core/src/test/java/org/jasig/cas/ticket/ServiceTicketImplTests.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsService.java
	checkstyle-rules.xml
Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractAuthenticationManager.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/DirectMappingAuthenticationManagerImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/principal/AbstractWebApplicationService.java
	cas-server-core/src/main/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationService.java
	cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicket.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
	cas-server-core/src/main/java/org/jasig/cas/web/support/CasArgumentExtractor.java
	cas-server-core/src/test/java/org/jasig/cas/ticket/ServiceTicketImplTests.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsService.java
	checkstyle-rules.xml
Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractAuthenticationManager.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/DirectMappingAuthenticationManagerImpl.java
	cas-server-core/src/main/java/org/jasig/cas/authentication/principal/AbstractWebApplicationService.java
	cas-server-core/src/main/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationService.java
	cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicket.java
	cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
	cas-server-core/src/main/java/org/jasig/cas/web/support/CasArgumentExtractor.java
	cas-server-core/src/test/java/org/jasig/cas/ticket/ServiceTicketImplTests.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsService.java
	checkstyle-rules.xml
Fixes to the license headers.
Re-enabled a commented out test on throttling.
javadoc fixes. Removed stack trace instances that were printed to console as well as syserr messages.
javadoc fixes. Removed stack trace instances that were printed to console as well as syserr messages.