Merge branch 'master' into frontchannel-slo v2.3.0-slo10
-rw-r--r-- 622 .checkstyle
-rw-r--r-- 472 .classpath
-rw-r--r-- 884 .project
drwxr-xr-x - .settings
-rw-r--r-- 11357 LICENSE.txt
-rw-r--r-- 4592 checkstyle.xml
drwxr-xr-x - doc
-rw-r--r-- 18867 pom.xml
drwxr-xr-x - src