Merge branch 'fixTest' into 1.6.x
Create wro4j-osgi bundle

See wro4j-osgi/README.md for more
Use latest 1.6.4-SNAPSHOT in osgi module
update comments to make it clear that modification is related to osgi
fix merge conflicts