Update war layout to package custom scope dependencies in WEB-INF/lib/

Fixes gh-2187
Merge branch '1.1.x'