Merge branch 'webjar' into 1.6.x
reuse same instance of webjarUriLocator
fix merge conflicts