Merge branch 'osgi' into 1.6.x
update less4j to 1.0.3 and remove unnecessary exclusion
fix merge conflicts