Merging branch 'master' into issue-5933-Get-WEB-INF-lib-Jars-and-Starter-out-of-github