Merge branch 'master' into checkstyle-naming
Conflicts: cas-server-core/src/main/java/org/jasig/cas/services/DefaultServicesManagerImpl.java
Showing
Conflicts: cas-server-core/src/main/java/org/jasig/cas/services/DefaultServicesManagerImpl.java