Merge branch 'i688' into 1.6.x
upgrade less4j & googleClosure dependency and fix failing unit tests
prepare new dev iteration
fix merge conflicts