Merge branch 'fix' into 1.7.x
use correct parent version
use correct parent version in pom.xml
Merge branch 'issue660' into 1.7.x
add new configuration option contextFolders (csv)
replace contextFolder with contextFolders & fix failing unit tests
remove invalid submodule
servletContext option now accept multiple values (CSV).
move aggregatedFolder computation into dedicated class and write more unit tests
fix merge conflicts
fix merge conflicts
fix failing unit test