Merge branch 'issue826' into 1.7.x
update less4j version & webjar-locator version
Merge branch 'issue814' into 2.0.x