fix merge conflicts
Merge branch 'submoduleRunner' into 1.7.x
update less4j version to 1.2.1
Merge branch '814' into 2.0.x