Various fixes, exposing the latest javax.annotation in karaf