Fix legal and code style issues
[KARAF-2779] Fix wrapper core bundle import on karaf.util.locks