Merge branch 'issue730' into 1.6.x
fix cssUrlRewriting issue with classpath resources
fix merge conflicts