fix the issue with locating webjar & classpath resource containing query path in the uri
Merge branch 'issue826' into 1.7.x